forked from pool/glibc
108 lines
3.8 KiB
Diff
108 lines
3.8 KiB
Diff
|
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.
|
||
|
|
|
||
|
|
Index: glibc-2.29/elf/dl-sysdep.c
|
||
|
|
===================================================================
|
||
|
|
--- glibc-2.29.orig/elf/dl-sysdep.c
|
||
|
|
+++ glibc-2.29/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)
|
||
|
|
Index: glibc-2.29/sysdeps/powerpc/dl-procinfo.h
|
||
|
|
===================================================================
|
||
|
|
--- glibc-2.29.orig/sysdeps/powerpc/dl-procinfo.h
|
||
|
|
+++ glibc-2.29/sysdeps/powerpc/dl-procinfo.h
|
||
|
|
@@ -225,7 +225,7 @@ _dl_procinfo (unsigned int type, unsigne
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
default:
|
||
|
|
- /* This should not happen. */
|
||
|
|
+ /* Fallback to generic output mechanism. */
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
_dl_printf ("\n");
|
||
|
|
Index: glibc-2.29/sysdeps/sparc/dl-procinfo.h
|
||
|
|
===================================================================
|
||
|
|
--- glibc-2.29.orig/sysdeps/sparc/dl-procinfo.h
|
||
|
|
+++ glibc-2.29/sysdeps/sparc/dl-procinfo.h
|
||
|
|
@@ -31,8 +31,8 @@ _dl_procinfo (unsigned int type, unsigne
|
||
|
|
{
|
||
|
|
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: ");
|
||
|
|
Index: glibc-2.29/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
|
||
|
|
===================================================================
|
||
|
|
--- glibc-2.29.orig/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
|
||
|
|
+++ glibc-2.29/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
|
||
|
|
@@ -67,7 +67,7 @@ _dl_procinfo (unsigned int type, unsigne
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
default:
|
||
|
|
- /* This should not happen. */
|
||
|
|
+ /* Fallback to generic output mechanism. */
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
_dl_printf ("\n");
|
||
|
|
Index: glibc-2.29/sysdeps/unix/sysv/linux/i386/dl-procinfo.h
|
||
|
|
===================================================================
|
||
|
|
--- glibc-2.29.orig/sysdeps/unix/sysv/linux/i386/dl-procinfo.h
|
||
|
|
+++ glibc-2.29/sysdeps/unix/sysv/linux/i386/dl-procinfo.h
|
||
|
|
@@ -30,8 +30,8 @@ _dl_procinfo (unsigned int type, unsigne
|
||
|
|
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: ");
|
||
|
|
Index: glibc-2.29/sysdeps/unix/sysv/linux/s390/dl-procinfo.h
|
||
|
|
===================================================================
|
||
|
|
--- glibc-2.29.orig/sysdeps/unix/sysv/linux/s390/dl-procinfo.h
|
||
|
|
+++ glibc-2.29/sysdeps/unix/sysv/linux/s390/dl-procinfo.h
|
||
|
|
@@ -32,8 +32,8 @@ _dl_procinfo (unsigned int type, unsigne
|
||
|
|
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: ");
|