diff mbox series

S390: Sync HWCAP names with kernel by adding aliases [BZ #25971]

Message ID 20200812142831.3694409-1-stli@linux.ibm.com
State Committed
Headers show
Series S390: Sync HWCAP names with kernel by adding aliases [BZ #25971] | expand

Commit Message

Stefan Liebler Aug. 12, 2020, 2:28 p.m. UTC
Unfortunately some HWCAP names like HWCAP_S390_VX differs between
kernel (see <kernel>/arch/s390/include/asm/elf.h) and glibc.

Therefore, those HWCAP names from kernel are now introduced as alias
to the existing ones in glibc.
---
 sysdeps/s390/dl-procinfo.h                | 3 +++
 sysdeps/unix/sysv/linux/s390/bits/hwcap.h | 3 +++
 2 files changed, 6 insertions(+)

Comments

Stefan Liebler Aug. 20, 2020, 9:05 a.m. UTC | #1
On 8/12/20 4:28 PM, Stefan Liebler wrote:
> Unfortunately some HWCAP names like HWCAP_S390_VX differs between
> kernel (see <kernel>/arch/s390/include/asm/elf.h) and glibc.
> 
> Therefore, those HWCAP names from kernel are now introduced as alias
> to the existing ones in glibc.
> ---
>  sysdeps/s390/dl-procinfo.h                | 3 +++
>  sysdeps/unix/sysv/linux/s390/bits/hwcap.h | 3 +++
>  2 files changed, 6 insertions(+)
> 
> diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h
> index 0db4bc39c7..08eee109f7 100644
> --- a/sysdeps/s390/dl-procinfo.h
> +++ b/sysdeps/s390/dl-procinfo.h
> @@ -51,8 +51,11 @@ enum
>    HWCAP_S390_HIGH_GPRS = 1 << 9,
>    HWCAP_S390_TE = 1 << 10,
>    HWCAP_S390_VX = 1 << 11,
> +  HWCAP_S390_VXRS = HWCAP_S390_VX,
>    HWCAP_S390_VXD = 1 << 12,
> +  HWCAP_S390_VXRS_BCD = HWCAP_S390_VXD,
>    HWCAP_S390_VXE = 1 << 13,
> +  HWCAP_S390_VXRS_EXT = HWCAP_S390_VXE,
>    HWCAP_S390_GS = 1 << 14,
>    HWCAP_S390_VXRS_EXT2 = 1 << 15,
>    HWCAP_S390_VXRS_PDE = 1 << 16,
> diff --git a/sysdeps/unix/sysv/linux/s390/bits/hwcap.h b/sysdeps/unix/sysv/linux/s390/bits/hwcap.h
> index 6adbec018b..f2998ff131 100644
> --- a/sysdeps/unix/sysv/linux/s390/bits/hwcap.h
> +++ b/sysdeps/unix/sysv/linux/s390/bits/hwcap.h
> @@ -36,8 +36,11 @@
>  #define HWCAP_S390_HIGH_GPRS    512
>  #define HWCAP_S390_TE           1024
>  #define HWCAP_S390_VX           2048
> +#define HWCAP_S390_VXRS         HWCAP_S390_VX
>  #define HWCAP_S390_VXD          4096
> +#define HWCAP_S390_VXRS_BCD     HWCAP_S390_VXD
>  #define HWCAP_S390_VXE          8192
> +#define HWCAP_S390_VXRS_EXT     HWCAP_S390_VXE
>  #define HWCAP_S390_GS           16384
>  #define HWCAP_S390_VXRS_EXT2    32768
>  #define HWCAP_S390_VXRS_PDE     65536
> 

Ping
Carlos O'Donell Aug. 20, 2020, 9:49 p.m. UTC | #2
On 8/12/20 10:28 AM, Stefan Liebler via Libc-alpha wrote:
> Unfortunately some HWCAP names like HWCAP_S390_VX differs between
> kernel (see <kernel>/arch/s390/include/asm/elf.h) and glibc.
> 
> Therefore, those HWCAP names from kernel are now introduced as alias
> to the existing ones in glibc.
> ---
>  sysdeps/s390/dl-procinfo.h                | 3 +++
>  sysdeps/unix/sysv/linux/s390/bits/hwcap.h | 3 +++
>  2 files changed, 6 insertions(+)
> 
> diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h
> index 0db4bc39c7..08eee109f7 100644
> --- a/sysdeps/s390/dl-procinfo.h
> +++ b/sysdeps/s390/dl-procinfo.h
> @@ -51,8 +51,11 @@ enum
>    HWCAP_S390_HIGH_GPRS = 1 << 9,
>    HWCAP_S390_TE = 1 << 10,
>    HWCAP_S390_VX = 1 << 11,
> +  HWCAP_S390_VXRS = HWCAP_S390_VX,
>    HWCAP_S390_VXD = 1 << 12,
> +  HWCAP_S390_VXRS_BCD = HWCAP_S390_VXD,
>    HWCAP_S390_VXE = 1 << 13,
> +  HWCAP_S390_VXRS_EXT = HWCAP_S390_VXE,
>    HWCAP_S390_GS = 1 << 14,
>    HWCAP_S390_VXRS_EXT2 = 1 << 15,
>    HWCAP_S390_VXRS_PDE = 1 << 16,
> diff --git a/sysdeps/unix/sysv/linux/s390/bits/hwcap.h b/sysdeps/unix/sysv/linux/s390/bits/hwcap.h
> index 6adbec018b..f2998ff131 100644
> --- a/sysdeps/unix/sysv/linux/s390/bits/hwcap.h
> +++ b/sysdeps/unix/sysv/linux/s390/bits/hwcap.h
> @@ -36,8 +36,11 @@
>  #define HWCAP_S390_HIGH_GPRS    512
>  #define HWCAP_S390_TE           1024
>  #define HWCAP_S390_VX           2048
> +#define HWCAP_S390_VXRS         HWCAP_S390_VX
>  #define HWCAP_S390_VXD          4096
> +#define HWCAP_S390_VXRS_BCD     HWCAP_S390_VXD
>  #define HWCAP_S390_VXE          8192
> +#define HWCAP_S390_VXRS_EXT     HWCAP_S390_VXE
>  #define HWCAP_S390_GS           16384
>  #define HWCAP_S390_VXRS_EXT2    32768
>  #define HWCAP_S390_VXRS_PDE     65536
> 

As the machine maintainer you should assume consensus and just commit this.

I assume you know what you're doing synchronizing and matching these names.
Stefan Liebler Aug. 21, 2020, 9:30 a.m. UTC | #3
On 8/20/20 11:49 PM, Carlos O'Donell wrote:
> On 8/12/20 10:28 AM, Stefan Liebler via Libc-alpha wrote:
>> Unfortunately some HWCAP names like HWCAP_S390_VX differs between
>> kernel (see <kernel>/arch/s390/include/asm/elf.h) and glibc.
>>
>> Therefore, those HWCAP names from kernel are now introduced as alias
>> to the existing ones in glibc.
>> ---
>>  sysdeps/s390/dl-procinfo.h                | 3 +++
>>  sysdeps/unix/sysv/linux/s390/bits/hwcap.h | 3 +++
>>  2 files changed, 6 insertions(+)
>>
>> diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h
>> index 0db4bc39c7..08eee109f7 100644
>> --- a/sysdeps/s390/dl-procinfo.h
>> +++ b/sysdeps/s390/dl-procinfo.h
>> @@ -51,8 +51,11 @@ enum
>>    HWCAP_S390_HIGH_GPRS = 1 << 9,
>>    HWCAP_S390_TE = 1 << 10,
>>    HWCAP_S390_VX = 1 << 11,
>> +  HWCAP_S390_VXRS = HWCAP_S390_VX,
>>    HWCAP_S390_VXD = 1 << 12,
>> +  HWCAP_S390_VXRS_BCD = HWCAP_S390_VXD,
>>    HWCAP_S390_VXE = 1 << 13,
>> +  HWCAP_S390_VXRS_EXT = HWCAP_S390_VXE,
>>    HWCAP_S390_GS = 1 << 14,
>>    HWCAP_S390_VXRS_EXT2 = 1 << 15,
>>    HWCAP_S390_VXRS_PDE = 1 << 16,
>> diff --git a/sysdeps/unix/sysv/linux/s390/bits/hwcap.h b/sysdeps/unix/sysv/linux/s390/bits/hwcap.h
>> index 6adbec018b..f2998ff131 100644
>> --- a/sysdeps/unix/sysv/linux/s390/bits/hwcap.h
>> +++ b/sysdeps/unix/sysv/linux/s390/bits/hwcap.h
>> @@ -36,8 +36,11 @@
>>  #define HWCAP_S390_HIGH_GPRS    512
>>  #define HWCAP_S390_TE           1024
>>  #define HWCAP_S390_VX           2048
>> +#define HWCAP_S390_VXRS         HWCAP_S390_VX
>>  #define HWCAP_S390_VXD          4096
>> +#define HWCAP_S390_VXRS_BCD     HWCAP_S390_VXD
>>  #define HWCAP_S390_VXE          8192
>> +#define HWCAP_S390_VXRS_EXT     HWCAP_S390_VXE
>>  #define HWCAP_S390_GS           16384
>>  #define HWCAP_S390_VXRS_EXT2    32768
>>  #define HWCAP_S390_VXRS_PDE     65536
>>
> 
> As the machine maintainer you should assume consensus and just commit this.
> 
> I assume you know what you're doing synchronizing and matching these names.
> 
Sure. Nevertheless feedback is always welcome and I can also wait a bit
before commiting it.

Now I've committed the patch and resolved the bugzilla.

Thanks.
Stefan
diff mbox series

Patch

diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h
index 0db4bc39c7..08eee109f7 100644
--- a/sysdeps/s390/dl-procinfo.h
+++ b/sysdeps/s390/dl-procinfo.h
@@ -51,8 +51,11 @@  enum
   HWCAP_S390_HIGH_GPRS = 1 << 9,
   HWCAP_S390_TE = 1 << 10,
   HWCAP_S390_VX = 1 << 11,
+  HWCAP_S390_VXRS = HWCAP_S390_VX,
   HWCAP_S390_VXD = 1 << 12,
+  HWCAP_S390_VXRS_BCD = HWCAP_S390_VXD,
   HWCAP_S390_VXE = 1 << 13,
+  HWCAP_S390_VXRS_EXT = HWCAP_S390_VXE,
   HWCAP_S390_GS = 1 << 14,
   HWCAP_S390_VXRS_EXT2 = 1 << 15,
   HWCAP_S390_VXRS_PDE = 1 << 16,
diff --git a/sysdeps/unix/sysv/linux/s390/bits/hwcap.h b/sysdeps/unix/sysv/linux/s390/bits/hwcap.h
index 6adbec018b..f2998ff131 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/hwcap.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/hwcap.h
@@ -36,8 +36,11 @@ 
 #define HWCAP_S390_HIGH_GPRS    512
 #define HWCAP_S390_TE           1024
 #define HWCAP_S390_VX           2048
+#define HWCAP_S390_VXRS         HWCAP_S390_VX
 #define HWCAP_S390_VXD          4096
+#define HWCAP_S390_VXRS_BCD     HWCAP_S390_VXD
 #define HWCAP_S390_VXE          8192
+#define HWCAP_S390_VXRS_EXT     HWCAP_S390_VXE
 #define HWCAP_S390_GS           16384
 #define HWCAP_S390_VXRS_EXT2    32768
 #define HWCAP_S390_VXRS_PDE     65536