diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2019-03-13 10:45:35 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2019-03-13 10:51:23 +0100 |
| commit | bc6f839fb4066be83272c735e662850af2595777 (patch) | |
| tree | 476b3e8cee766fae7d816d39efec7b374c4e367d /elf | |
| parent | 067fc32968b601493f4b247a3ac00caeea3f3d61 (diff) | |
| download | glibc-bc6f839fb4066be83272c735e662850af2595777.tar.gz glibc-bc6f839fb4066be83272c735e662850af2595777.tar.xz glibc-bc6f839fb4066be83272c735e662850af2595777.zip | |
Fix output of LD_SHOW_AUXV=1.
Starting with commit 1616d034b61622836d3a36af53dcfca7624c844e the output was corrupted on some platforms as _dl_procinfo was called for every auxv entry and on some architectures like s390 all entries were represented as "AT_HWCAP". This patch is removing the condition and let _dl_procinfo decide if an entry is printed in a platform specific or generic way. This patch also adjusts all _dl_procinfo implementations which assumed that they are only called for AT_HWCAP or AT_HWCAP2. They are now just returning a non-zero-value for entries which are not handled platform specifc. ChangeLog: * elf/dl-sysdep.c (_dl_show_auxv): Remove condition and always call _dl_procinfo. * sysdeps/unix/sysv/linux/s390/dl-procinfo.h (_dl_procinfo): Ignore types other than AT_HWCAP. * sysdeps/sparc/dl-procinfo.h (_dl_procinfo): Likewise. * sysdeps/unix/sysv/linux/i386/dl-procinfo.h (_dl_procinfo): Likewise. * sysdeps/powerpc/dl-procinfo.h (_dl_procinfo): Adjust comment in the case of falling back to generic output mechanism. * sysdeps/unix/sysv/linux/arm/dl-procinfo.h (_dl_procinfo): Likewise. (cherry picked from commit 7c6513082b787a7d36ab7d75720b48f8a216089c) Conflicts: ChangeLog
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-sysdep.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c index 5f6c679a3f..5d19b100b2 100644 --- a/elf/dl-sysdep.c +++ b/elf/dl-sysdep.c @@ -328,14 +328,9 @@ _dl_show_auxv (void) assert (AT_NULL == 0); assert (AT_IGNORE == 1); - if (av->a_type == AT_HWCAP || av->a_type == AT_HWCAP2 - || AT_L1I_CACHEGEOMETRY || AT_L1D_CACHEGEOMETRY - || AT_L2_CACHEGEOMETRY || AT_L3_CACHEGEOMETRY) - { - /* These are handled in a special way per platform. */ - if (_dl_procinfo (av->a_type, av->a_un.a_val) == 0) - continue; - } + /* Some entries are handled in a special way per platform. */ + if (_dl_procinfo (av->a_type, av->a_un.a_val) == 0) + continue; if (idx < sizeof (auxvars) / sizeof (auxvars[0]) && auxvars[idx].form != unknown) |