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:45:35 +0100 |
commit | 7c6513082b787a7d36ab7d75720b48f8a216089c (patch) | |
tree | a4881ae3ffaf0c109234140e3a3d5faf16862d5b /sysdeps/sparc | |
parent | 38b52865d4ccfee3647f27e969e539a4396a73b1 (diff) | |
download | glibc-7c6513082b787a7d36ab7d75720b48f8a216089c.tar.gz glibc-7c6513082b787a7d36ab7d75720b48f8a216089c.tar.xz glibc-7c6513082b787a7d36ab7d75720b48f8a216089c.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.
Diffstat (limited to 'sysdeps/sparc')
-rw-r--r-- | sysdeps/sparc/dl-procinfo.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/sparc/dl-procinfo.h b/sysdeps/sparc/dl-procinfo.h index 282b8c5117..64ee267fc7 100644 --- a/sysdeps/sparc/dl-procinfo.h +++ b/sysdeps/sparc/dl-procinfo.h @@ -31,8 +31,8 @@ _dl_procinfo (unsigned int type, unsigned long int word) { int i; - /* Fallback to unknown output mechanism. */ - if (type == AT_HWCAP2) + /* Fallback to generic output mechanism. */ + if (type != AT_HWCAP) return -1; _dl_printf ("AT_HWCAP: "); |