mirror of
https://sourceware.org/git/glibc.git
synced 2025-10-30 10:45:40 +03:00
7c6513082b
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.
50 lines
1.5 KiB
C
50 lines
1.5 KiB
C
/* Linux/s390 version of processor capability information handling macros.
|
|
Copyright (C) 2006-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2006.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _DL_S390_PROCINFO_H
|
|
#define _DL_S390_PROCINFO_H 1
|
|
#include <sysdeps/s390/dl-procinfo.h>
|
|
#include <ldsodefs.h>
|
|
|
|
|
|
#undef _dl_procinfo
|
|
static inline int
|
|
__attribute__ ((unused))
|
|
_dl_procinfo (unsigned int type, unsigned long int word)
|
|
{
|
|
/* This table should match the information from arch/s390/kernel/setup.c
|
|
in the kernel sources. */
|
|
int i;
|
|
|
|
/* Fallback to generic output mechanism. */
|
|
if (type != AT_HWCAP)
|
|
return -1;
|
|
|
|
_dl_printf ("AT_HWCAP: ");
|
|
|
|
for (i = 0; i < _DL_HWCAP_COUNT; ++i)
|
|
if (word & (1UL << i))
|
|
_dl_printf (" %s", GLRO(dl_s390_cap_flags)[i]);
|
|
|
|
_dl_printf ("\n");
|
|
|
|
return 0;
|
|
}
|
|
#endif
|