Fix output of LD_SHOW_AUXV=1.
Starting with commit 1616d034b6
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
This commit is contained in:
parent
067fc32968
commit
bc6f839fb4
14
ChangeLog
14
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>
|
2019-02-15 Florian Weimer <fweimer@redhat.com>
|
||||||
|
|
||||||
[BZ #24211]
|
[BZ #24211]
|
||||||
|
|
|
@ -328,14 +328,9 @@ _dl_show_auxv (void)
|
||||||
assert (AT_NULL == 0);
|
assert (AT_NULL == 0);
|
||||||
assert (AT_IGNORE == 1);
|
assert (AT_IGNORE == 1);
|
||||||
|
|
||||||
if (av->a_type == AT_HWCAP || av->a_type == AT_HWCAP2
|
/* Some entries are handled in a special way per platform. */
|
||||||
|| AT_L1I_CACHEGEOMETRY || AT_L1D_CACHEGEOMETRY
|
if (_dl_procinfo (av->a_type, av->a_un.a_val) == 0)
|
||||||
|| AT_L2_CACHEGEOMETRY || AT_L3_CACHEGEOMETRY)
|
continue;
|
||||||
{
|
|
||||||
/* These 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])
|
if (idx < sizeof (auxvars) / sizeof (auxvars[0])
|
||||||
&& auxvars[idx].form != unknown)
|
&& auxvars[idx].form != unknown)
|
||||||
|
|
|
@ -225,7 +225,7 @@ _dl_procinfo (unsigned int type, unsigned long int word)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
/* This should not happen. */
|
/* Fallback to generic output mechanism. */
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
_dl_printf ("\n");
|
_dl_printf ("\n");
|
||||||
|
|
|
@ -31,8 +31,8 @@ _dl_procinfo (unsigned int type, unsigned long int word)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* Fallback to unknown output mechanism. */
|
/* Fallback to generic output mechanism. */
|
||||||
if (type == AT_HWCAP2)
|
if (type != AT_HWCAP)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
_dl_printf ("AT_HWCAP: ");
|
_dl_printf ("AT_HWCAP: ");
|
||||||
|
|
|
@ -67,7 +67,7 @@ _dl_procinfo (unsigned int type, unsigned long int word)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
/* This should not happen. */
|
/* Fallback to generic output mechanism. */
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
_dl_printf ("\n");
|
_dl_printf ("\n");
|
||||||
|
|
|
@ -30,8 +30,8 @@ _dl_procinfo (unsigned int type, unsigned long int word)
|
||||||
in the kernel sources. */
|
in the kernel sources. */
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* Fallback to unknown output mechanism. */
|
/* Fallback to generic output mechanism. */
|
||||||
if (type == AT_HWCAP2)
|
if (type != AT_HWCAP)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
_dl_printf ("AT_HWCAP: ");
|
_dl_printf ("AT_HWCAP: ");
|
||||||
|
|
|
@ -32,8 +32,8 @@ _dl_procinfo (unsigned int type, unsigned long int word)
|
||||||
in the kernel sources. */
|
in the kernel sources. */
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* Fallback to unknown output mechanism. */
|
/* Fallback to generic output mechanism. */
|
||||||
if (type == AT_HWCAP2)
|
if (type != AT_HWCAP)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
_dl_printf ("AT_HWCAP: ");
|
_dl_printf ("AT_HWCAP: ");
|
||||||
|
|
Loading…
Reference in New Issue