161 lines
5.7 KiB
Diff
161 lines
5.7 KiB
Diff
From bc6f839fb4066be83272c735e662850af2595777 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Liebler <stli@linux.ibm.com>
|
|
Date: Wed, 13 Mar 2019 10:45:35 +0100
|
|
Subject: [PATCH 07] 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
|
|
---
|
|
ChangeLog | 14 ++++++++++++++
|
|
elf/dl-sysdep.c | 11 +++--------
|
|
sysdeps/powerpc/dl-procinfo.h | 2 +-
|
|
sysdeps/sparc/dl-procinfo.h | 4 ++--
|
|
sysdeps/unix/sysv/linux/arm/dl-procinfo.h | 2 +-
|
|
sysdeps/unix/sysv/linux/i386/dl-procinfo.h | 4 ++--
|
|
sysdeps/unix/sysv/linux/s390/dl-procinfo.h | 4 ++--
|
|
7 files changed, 25 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index a6a0ce19ed..90558e434c 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -1,3 +1,17 @@
|
|
+2019-03-13 Stefan Liebler <stli@linux.ibm.com>
|
|
+
|
|
+ * 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.
|
|
+
|
|
2019-02-15 Florian Weimer <fweimer@redhat.com>
|
|
|
|
[BZ #24211]
|
|
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)
|
|
diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h
|
|
index f542f7318f..dfc3b33a72 100644
|
|
--- a/sysdeps/powerpc/dl-procinfo.h
|
|
+++ b/sysdeps/powerpc/dl-procinfo.h
|
|
@@ -225,7 +225,7 @@ _dl_procinfo (unsigned int type, unsigned long int word)
|
|
break;
|
|
}
|
|
default:
|
|
- /* This should not happen. */
|
|
+ /* Fallback to generic output mechanism. */
|
|
return -1;
|
|
}
|
|
_dl_printf ("\n");
|
|
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: ");
|
|
diff --git a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
|
|
index 66c00297b7..05c62c8687 100644
|
|
--- a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
|
|
+++ b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
|
|
@@ -67,7 +67,7 @@ _dl_procinfo (unsigned int type, unsigned long int word)
|
|
break;
|
|
}
|
|
default:
|
|
- /* This should not happen. */
|
|
+ /* Fallback to generic output mechanism. */
|
|
return -1;
|
|
}
|
|
_dl_printf ("\n");
|
|
diff --git a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h
|
|
index 22b43431bc..0585cdaa9c 100644
|
|
--- a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h
|
|
+++ b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h
|
|
@@ -30,8 +30,8 @@ _dl_procinfo (unsigned int type, unsigned long int word)
|
|
in the kernel sources. */
|
|
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: ");
|
|
diff --git a/sysdeps/unix/sysv/linux/s390/dl-procinfo.h b/sysdeps/unix/sysv/linux/s390/dl-procinfo.h
|
|
index 19329a335b..d67fde368f 100644
|
|
--- a/sysdeps/unix/sysv/linux/s390/dl-procinfo.h
|
|
+++ b/sysdeps/unix/sysv/linux/s390/dl-procinfo.h
|
|
@@ -32,8 +32,8 @@ _dl_procinfo (unsigned int type, unsigned long int word)
|
|
in the kernel sources. */
|
|
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: ");
|
|
|