From f58f65cd7d3318d3af0073c782844d1a6008b111 Mon Sep 17 00:00:00 2001 From: "Ryan S. Arnold" Date: Fri, 3 May 2013 14:14:40 -0500 Subject: Add support for AT_HWCAP2. --- ChangeLog | 17 ++++++++++++++ elf/dl-support.c | 13 ++++++++++- elf/dl-sysdep.c | 20 ++++++++++++---- elf/elf.h | 3 +++ misc/getauxval.c | 2 ++ ports/ChangeLog.alpha | 5 ++++ ports/ChangeLog.arm | 5 ++++ ports/ChangeLog.mips | 5 ++++ ports/ChangeLog.powerpc | 5 ++++ ports/sysdeps/alpha/dl-procinfo.h | 2 +- ports/sysdeps/mips/dl-procinfo.h | 2 +- ports/sysdeps/powerpc/dl-procinfo.h | 30 ++++++++++++++++++++---- ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h | 6 ++++- sysdeps/generic/dl-procinfo.h | 2 +- sysdeps/i386/dl-procinfo.h | 2 +- sysdeps/powerpc/dl-procinfo.h | 31 +++++++++++++++++++++---- sysdeps/s390/dl-procinfo.h | 2 +- sysdeps/sparc/dl-procinfo.h | 6 ++++- sysdeps/unix/sysv/linux/i386/dl-procinfo.h | 6 ++++- sysdeps/unix/sysv/linux/s390/dl-procinfo.h | 6 ++++- 20 files changed, 147 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1fe59a3d5e..56f8d11521 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2013-05-16 Ryan S. Arnold + + * elf/dl-support.c (_dl_aux_init): Add support for AT_HWCAP2. + * elf/dl-sysdep.c (_dl_sysdep_start, _dl_show_auxv): Likewise. + * misc/getauxval.c (__getauxval): Likewise. + * sysdeps/powerpc/dl-procinfo.h (_dl_procinfo): Add support for + displaying AT_HWCAP2 strings. + * elf/elf.h [AT_HWCAP2]: Add a new a_type entry. + * sysdeps/s390/dl-procinfo.h (_dl_procinfo): Add 'type' parameter for + AT_HWCAP2 support. + * sysdeps/i386/dl-procinfo.h: Likewise. + * sysdeps/generic/dl-procinfo.h: Likewise. + * sysdeps/unix/sysv/linux/s390/dl-procinfo.h: (_dl_procinfo): Add + nop support for AT_HWCAP2. + * sysdeps/unix/sysv/linux/i386/dl-procinfo.h: Likewise. + * sysdeps/sparc/dl-procinfo.h: Likewise. + 2013-05-16 Ryan S. Arnold * crypt/sha512-block.c: Add missing #include due to diff --git a/elf/dl-support.c b/elf/dl-support.c index b3ab9560ad..ed8000023d 100644 --- a/elf/dl-support.c +++ b/elf/dl-support.c @@ -194,6 +194,10 @@ _dl_aux_init (ElfW(auxv_t) *av) uid_t uid = 0; gid_t gid = 0; + /* Don't rely on a specific order of AT_HWCAP and AT_HWCAP2. Collate into a + zeroed temp and assign to _dl_hwcap after the auxv has been parsed. */ + uint64_t hwcap = 0; + _dl_auxv = av; for (; av->a_type != AT_NULL; ++av) switch (av->a_type) @@ -212,8 +216,12 @@ _dl_aux_init (ElfW(auxv_t) *av) GL(dl_phnum) = av->a_un.a_val; break; case AT_HWCAP: - GLRO(dl_hwcap) = (unsigned long int) av->a_un.a_val; + hwcap |= (unsigned long int) av->a_un.a_val; + break; + case AT_HWCAP2: + hwcap |= ((uint64_t) av->a_un.a_val) << 32; break; + #ifdef NEED_DL_SYSINFO case AT_SYSINFO: GL(dl_sysinfo) = av->a_un.a_val; @@ -252,6 +260,9 @@ _dl_aux_init (ElfW(auxv_t) *av) DL_PLATFORM_AUXV # endif } + + GLRO(dl_hwcap) = hwcap; + if (seen == 0xf) { __libc_enable_secure = uid != 0 || gid != 0; diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c index 52de23f44b..6fdcb13145 100644 --- a/elf/dl-sysdep.c +++ b/elf/dl-sysdep.c @@ -107,6 +107,10 @@ _dl_sysdep_start (void **start_argptr, uintptr_t new_sysinfo = 0; #endif + /* Don't rely on a specific order of AT_HWCAP and AT_HWCAP2. Collate into a + zeroed temp and assign to _dl_hwcap after the auxv has been parsed. */ + uint64_t hwcap = 0; + __libc_stack_end = DL_STACK_END (start_argptr); DL_FIND_ARG_COMPONENTS (start_argptr, _dl_argc, INTUSE(_dl_argv), _environ, GLRO(dl_auxv)); @@ -154,7 +158,10 @@ _dl_sysdep_start (void **start_argptr, GLRO(dl_platform) = (void *) av->a_un.a_val; break; case AT_HWCAP: - GLRO(dl_hwcap) = (unsigned long int) av->a_un.a_val; + hwcap |= (unsigned long int) av->a_un.a_val; + break; + case AT_HWCAP2: + hwcap |= ((uint64_t) av->a_un.a_val) << 32; break; case AT_CLKTCK: GLRO(dl_clktck) = av->a_un.a_val; @@ -180,6 +187,8 @@ _dl_sysdep_start (void **start_argptr, #endif } + GLRO(dl_hwcap) = hwcap; + #ifndef HAVE_AUX_SECURE if (seen != -1) { @@ -303,6 +312,7 @@ _dl_show_auxv (void) [AT_SYSINFO - 2] = { "SYSINFO: 0x", hex }, [AT_SYSINFO_EHDR - 2] = { "SYSINFO_EHDR: 0x", hex }, [AT_RANDOM - 2] = { "RANDOM: 0x", hex }, + [AT_HWCAP2 - 2] = { "HWCAP2: ", hex }, }; unsigned int idx = (unsigned int) (av->a_type - 2); @@ -314,10 +324,12 @@ _dl_show_auxv (void) assert (AT_NULL == 0); assert (AT_IGNORE == 1); - if (av->a_type == AT_HWCAP) + if (av->a_type == AT_HWCAP || av->a_type == AT_HWCAP2) { - /* This is handled special. */ - if (_dl_procinfo (av->a_un.a_val) == 0) + /* HWCAP bits are translated into representative strings, per + platform. */ + if (_dl_procinfo (av->a_type, av->a_un.a_val) == 0) + continue; } diff --git a/elf/elf.h b/elf/elf.h index 4ad4f39999..b473a0ebd5 100644 --- a/elf/elf.h +++ b/elf/elf.h @@ -1015,6 +1015,9 @@ typedef struct #define AT_RANDOM 25 /* Address of 16 random bytes. */ +#define AT_HWCAP2 26 /* Extended machine dependent hints + about processor capabilities. */ + #define AT_EXECFN 31 /* Filename of executable. */ /* Pointer to the global system page used for system calls and other diff --git a/misc/getauxval.c b/misc/getauxval.c index 4321e3718a..0d699229f6 100644 --- a/misc/getauxval.c +++ b/misc/getauxval.c @@ -26,6 +26,8 @@ __getauxval (unsigned long int type) if (type == AT_HWCAP) return GLRO(dl_hwcap); + else if (type == AT_HWCAP2) + return GLRO(dl_hwcap) >> 32; for (p = GLRO(dl_auxv); p->a_type != AT_NULL; p++) if (p->a_type == type) diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha index 9a77d276ab..70f9df0126 100644 --- a/ports/ChangeLog.alpha +++ b/ports/ChangeLog.alpha @@ -1,3 +1,8 @@ +2013-05-16 Ryan S. Arnold + + * sysdeps/alpha/dl-procinfo.h (_dl_procinfo): Add 'type' parameter for + AT_HWCAP2 support. + 2013-03-06 Andreas Jaeger * sysdeps/unix/sysv/linux/alpha/bits/mman.h (MAP_HUGE_MASK) diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm index 81b2a56eee..c7437c9e0d 100644 --- a/ports/ChangeLog.arm +++ b/ports/ChangeLog.arm @@ -1,3 +1,8 @@ +2013-05-16 Ryan S. Arnold + + * sysdeps/unix/sysv/linux/arm/dl-procinfo.h (_dl_procinfo): Add + nop support for AT_HWCAP2. + 2013-05-16 Ryan S. Arnold * sysdeps/unix/sysv/linux/arm/bits/atomic.h: Add missing #include diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips index 472ae21fb2..158f82366e 100644 --- a/ports/ChangeLog.mips +++ b/ports/ChangeLog.mips @@ -1,3 +1,8 @@ +2013-05-03 Ryan S. Arnold + + * sysdeps/mips/dl-procinfo.h (_dl_procinfo): Add 'type' parameter for + AT_HWCAP2 support. + 2013-05-16 Ryan S. Arnold * sysdeps/unix/sysv/linux/mips/kernel_rt_sigframe.h: Add missing diff --git a/ports/ChangeLog.powerpc b/ports/ChangeLog.powerpc index 2ba8e3754f..345df7b239 100644 --- a/ports/ChangeLog.powerpc +++ b/ports/ChangeLog.powerpc @@ -1,3 +1,8 @@ +2013-05-16 Ryan S. Arnold + + * sysdeps/powerpc/dl-procinfo.h (_dl_procinfo): Add support for + displaying AT_HWCAP2 strings. + 2013-02-28 Joseph Myers [BZ #13550] diff --git a/ports/sysdeps/alpha/dl-procinfo.h b/ports/sysdeps/alpha/dl-procinfo.h index 523d966761..0344dbc968 100644 --- a/ports/sysdeps/alpha/dl-procinfo.h +++ b/ports/sysdeps/alpha/dl-procinfo.h @@ -51,7 +51,7 @@ _dl_string_platform (const char *str) }; /* We cannot provide a general printing function. */ -#define _dl_procinfo(word) -1 +#define _dl_procinfo(type, word) -1 /* There are no hardware capabilities defined. */ #define _dl_hwcap_string(idx) "" diff --git a/ports/sysdeps/mips/dl-procinfo.h b/ports/sysdeps/mips/dl-procinfo.h index 5cc9a44446..e96550c402 100644 --- a/ports/sysdeps/mips/dl-procinfo.h +++ b/ports/sysdeps/mips/dl-procinfo.h @@ -51,7 +51,7 @@ _dl_string_platform (const char *str) }; /* We cannot provide a general printing function. */ -#define _dl_procinfo(word) -1 +#define _dl_procinfo(type, word) -1 /* There are no hardware capabilities defined. */ #define _dl_hwcap_string(idx) "" diff --git a/ports/sysdeps/powerpc/dl-procinfo.h b/ports/sysdeps/powerpc/dl-procinfo.h index b45465c3dd..a9d98d34ef 100644 --- a/ports/sysdeps/powerpc/dl-procinfo.h +++ b/ports/sysdeps/powerpc/dl-procinfo.h @@ -19,6 +19,7 @@ #ifndef _DL_PROCINFO_H #define _DL_PROCINFO_H 1 +#include #include #include /* This defines the PPC_FEATURE_* macros. */ @@ -153,19 +154,40 @@ _dl_string_platform (const char *str) } #ifdef IS_IN_rtld + static inline int __attribute__ ((unused)) -_dl_procinfo (int word) +_dl_procinfo (unsigned int type, int word) { - _dl_printf ("AT_HWCAP: "); + unsigned int first, count, str_offset; - for (int i = _DL_HWCAP_FIRST; i < _DL_HWCAP_COUNT; ++i) + switch(type) + { + case AT_HWCAP: + _dl_printf ("AT_HWCAP: "); + first = _DL_HWCAP_FIRST; + count = MIN(_DL_HWCAP_COUNT,_DL_HWCAP2_FIRST); + str_offset = 0; + break; + case AT_HWCAP2: + _dl_printf ("AT_HWCAP2: "); + first = 0; + count = _DL_HWCAP_COUNT - _DL_HWCAP2_FIRST; + str_offset = _DL_HWCAP2_FIRST; + break; + default: + /* This should not happen. */ + return -1; + } + + for (int i = first; i < count; ++i) if (word & (1 << i)) - _dl_printf (" %s", _dl_hwcap_string (i)); + _dl_printf (" %s", _dl_hwcap_string (str_offset + i)); _dl_printf ("\n"); return 0; + } #endif diff --git a/ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h b/ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h index 161e86c796..1f3a8ceb50 100644 --- a/ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h +++ b/ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h @@ -31,10 +31,14 @@ static inline int __attribute__ ((unused)) -_dl_procinfo (int word) +_dl_procinfo (unsigned int type, int word) { int i; + /* Unused for now. */ + if (type == AT_HWCAP2) + return 0; + _dl_printf ("AT_HWCAP: "); for (i = 0; i < _DL_HWCAP_COUNT; ++i) diff --git a/sysdeps/generic/dl-procinfo.h b/sysdeps/generic/dl-procinfo.h index 90c87d942a..a184a5918a 100644 --- a/sysdeps/generic/dl-procinfo.h +++ b/sysdeps/generic/dl-procinfo.h @@ -21,7 +21,7 @@ #define _DL_PROCINFO_H 1 /* We cannot provide a general printing function. */ -#define _dl_procinfo(word) -1 +#define _dl_procinfo(type, word) -1 /* There are no hardware capabilities defined. */ #define _dl_hwcap_string(idx) "" diff --git a/sysdeps/i386/dl-procinfo.h b/sysdeps/i386/dl-procinfo.h index 883fa7f0ab..233a3257e3 100644 --- a/sysdeps/i386/dl-procinfo.h +++ b/sysdeps/i386/dl-procinfo.h @@ -61,7 +61,7 @@ enum }; /* We cannot provide a general printing function. */ -#define _dl_procinfo(word) -1 +#define _dl_procinfo(type, word) -1 static inline const char * __attribute__ ((unused)) diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h index 19aa93b185..ca20732571 100644 --- a/sysdeps/powerpc/dl-procinfo.h +++ b/sysdeps/powerpc/dl-procinfo.h @@ -22,8 +22,9 @@ #include #include /* This defines the PPC_FEATURE_* macros. */ -/* There are 25 bits used, but they are bits 7..31. */ +/* There are 25 bits used in AT_HWCAP, but they are bits 7..31. */ #define _DL_HWCAP_FIRST 7 +#define _DL_HWCAP2_FIRST 32 #define _DL_HWCAP_COUNT 32 /* These bits influence library search. */ @@ -133,15 +134,35 @@ _dl_string_platform (const char *str) } #ifdef IS_IN_rtld + static inline int __attribute__ ((unused)) -_dl_procinfo (int word) +_dl_procinfo (unsigned int type, int word) { - _dl_printf ("AT_HWCAP: "); + unsigned int first, count, str_offset; - for (int i = _DL_HWCAP_FIRST; i < _DL_HWCAP_COUNT; ++i) + switch(type) + { + case AT_HWCAP: + _dl_printf ("AT_HWCAP: "); + first = _DL_HWCAP_FIRST; + count = MIN(_DL_HWCAP_COUNT,_DL_HWCAP2_FIRST); + str_offset = 0; + break; + case AT_HWCAP2: + _dl_printf ("AT_HWCAP2: "); + first = 0; + count = _DL_HWCAP_COUNT - _DL_HWCAP2_FIRST; + str_offset = _DL_HWCAP2_FIRST; + break; + default: + /* This should not happen. */ + return -1; + } + + for (int i = first; i < count; ++i) if (word & (1 << i)) - _dl_printf (" %s", _dl_hwcap_string (i)); + _dl_printf (" %s", _dl_hwcap_string (str_offset + i)); _dl_printf ("\n"); diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h index 717f6f9a50..45e27f1023 100644 --- a/sysdeps/s390/dl-procinfo.h +++ b/sysdeps/s390/dl-procinfo.h @@ -56,7 +56,7 @@ enum | HWCAP_S390_EIMM | HWCAP_S390_DFP) /* We cannot provide a general printing function. */ -#define _dl_procinfo(word) -1 +#define _dl_procinfo(type, word) -1 static inline const char * __attribute__ ((unused)) diff --git a/sysdeps/sparc/dl-procinfo.h b/sysdeps/sparc/dl-procinfo.h index a18b099586..57a250f7f3 100644 --- a/sysdeps/sparc/dl-procinfo.h +++ b/sysdeps/sparc/dl-procinfo.h @@ -27,10 +27,14 @@ static inline int __attribute__ ((unused)) -_dl_procinfo (int word) +_dl_procinfo (unsigned int type, int word) { int i; + /* Unused for now. */ + if (type == AT_HWCAP2) + return 0; + _dl_printf ("AT_HWCAP: "); for (i = 0; i < _DL_HWCAP_COUNT; ++i) diff --git a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h index a82f8f5b8d..745b556f24 100644 --- a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h @@ -24,12 +24,16 @@ #undef _dl_procinfo static inline int __attribute__ ((unused)) -_dl_procinfo (int word) +_dl_procinfo (unsigned int type, int word) { /* This table should match the information from arch/i386/kernel/setup.c in the kernel sources. */ int i; + /* Unused for now. */ + if (type == AT_HWCAP2) + return 0; + _dl_printf ("AT_HWCAP: "); for (i = 0; i < _DL_HWCAP_COUNT; ++i) diff --git a/sysdeps/unix/sysv/linux/s390/dl-procinfo.h b/sysdeps/unix/sysv/linux/s390/dl-procinfo.h index 5ca4b76ca7..9e9e3dc4f1 100644 --- a/sysdeps/unix/sysv/linux/s390/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/s390/dl-procinfo.h @@ -24,12 +24,16 @@ #undef _dl_procinfo static inline int __attribute__ ((unused)) -_dl_procinfo (int word) +_dl_procinfo (unsigned int type, int word) { /* This table should match the information from arch/s390/kernel/setup.c in the kernel sources. */ int i; + /* Unused for now. */ + if (type == AT_HWCAP2) + return 0; + _dl_printf ("AT_HWCAP: "); for (i = 0; i < _DL_HWCAP_COUNT; ++i) -- cgit 1.4.1