niansa-misc/glibc
1
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-06 20:58:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove unused dl-procinfo.h

Browse source 
Remove unused _dl_hwcap_string defines.  As a result many dl-procinfo.h headers
can be removed.  This also removes target specific _dl_procinfo implementations
which only printed HWCAP strings using dl_hwcap_string.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Wilco Dijkstra 2025-02-28 16:52:25 +00:00
parent c0f380c465
commit e5893e6349
29 changed files with 9 additions and 724 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
sysdeps/alpha/dl-procinfo.h
View file

@ -1,33 +0,0 @@
/* Alpha version of processor capability information handling macros.
Copyright (C) 2008-2025 Free Software Foundation, Inc.
This file is part of the GNU C Library.
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
<https://www.gnu.org/licenses/>. */
#ifndef _DL_PROCINFO_H
#define _DL_PROCINFO_H 1
#include <ldsodefs.h>
/* We cannot provide a general printing function. */
#define _dl_procinfo(type, word) -1
/* There are no hardware capabilities defined. */
#define _dl_hwcap_string(idx) ""
/* We don't have any hardware capabilities. */
#define _DL_HWCAP_COUNT 0
#endif /* dl-procinfo.h */

34
sysdeps/csky/dl-procinfo.h
View file

@ -1,34 +0,0 @@
/* C-SKY version of processor capability information handling macros.
Copyright (C) 2018-2025 Free Software Foundation, Inc.
This file is part of the GNU C Library.
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
<https://www.gnu.org/licenses/>. */
#ifndef _DL_PROCINFO_H
#define _DL_PROCINFO_H 1
#include <ldsodefs.h>
/* We cannot provide a general printing function. */
#define _dl_procinfo(word, val) -1
/* There are no hardware capabilities defined. */
#define _dl_hwcap_string(idx) ""
/* We don't have any hardware capabilities. */
#define _DL_HWCAP_COUNT 0
#endif /* dl-procinfo.h */

6
sysdeps/generic/dl-procinfo.h
View file

@ -22,10 +22,4 @@
/* We cannot provide a general printing function. */
#define _dl_procinfo(type, word) -1
/* There are no hardware capabilities defined. */
#define _dl_hwcap_string(idx) ""
/* We don't have any hardware capabilities. */
#define _DL_HWCAP_COUNT 0
#endif /* dl-procinfo.h */

19
sysdeps/i386/dl-procinfo.c
View file

@ -41,24 +41,5 @@
#include <sysdeps/x86/dl-procinfo.c>
#if !defined PROCINFO_DECL && defined SHARED
._dl_x86_cap_flags
#else
PROCINFO_CLASS const char _dl_x86_cap_flags[32][8]
#endif
#ifndef PROCINFO_DECL
= {
"fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
"cx8", "apic", "10", "sep", "mtrr", "pge", "mca", "cmov",
"pat", "pse36", "pn", "clflush", "20", "dts", "acpi", "mmx",
"fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", "pbe"
}
#endif
#if !defined SHARED || defined PROCINFO_DECL
;
#else
,
#endif
#undef PROCINFO_DECL
#undef PROCINFO_CLASS

27
sysdeps/mips/dl-procinfo.c
View file

@ -1,27 +0,0 @@
/* Data for Mips version of processor capability information.
Copyright (C) 2007-2025 Free Software Foundation, Inc.
This file is part of the GNU C Library.
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
<https://www.gnu.org/licenses/>. */
/* Note:
When compiling elf/ldconfig.c, PROCINFO_CLASS is defined to static.
This dl-procinfo.c is included in sysdeps/generic/ldsodefs.h.
Afterwards, if not yet defined, PROCINFO_CLASS is defined to EXTERN
just before dl-vdso-setup.c is included. A "static" _dl_vdso_xyz
function prototype would lead to gcc warnings/errors: defined but
not used. */
#undef PROCINFO_DECL
#undef PROCINFO_CLASS

33
sysdeps/mips/dl-procinfo.h
View file

@ -1,33 +0,0 @@
/* Mips version of processor capability information handling macros.
Copyright (C) 2007-2025 Free Software Foundation, Inc.
This file is part of the GNU C Library.
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
<https://www.gnu.org/licenses/>. */
#ifndef _DL_PROCINFO_H
#define _DL_PROCINFO_H 1
#include <ldsodefs.h>
/* We cannot provide a general printing function. */
#define _dl_procinfo(type, word) -1
/* There are no hardware capabilities defined. */
#define _dl_hwcap_string(idx) ""
/* We don't have any hardware capabilities. */
#define _DL_HWCAP_COUNT 0
#endif /* dl-procinfo.h */

1
sysdeps/s390/Makefile
View file

@ -43,7 +43,6 @@ $(modpfx)gconv-modules-s390.conf: ../sysdeps/s390/gconv-modules-s390.conf \
endif
ifeq ($(subdir),elf)
sysdep-dl-routines += dl-procinfo-s390
ifeq ($(build-shared),yes)
tests += tst-dl-runtime-resolve-noaudit tst-dl-runtime-resolve-audit \

3
sysdeps/s390/cpu-features.c
View file

@ -17,7 +17,8 @@
<https://www.gnu.org/licenses/>. */
#include <cpu-features.h>
#include <ldsodefs.h>
#include <sys/auxv.h>
#include <elf/dl-tunables.h>
#include <ifunc-memcmp.h>
#include <string.h>

26
sysdeps/s390/dl-procinfo-s390.c
View file

@ -1,26 +0,0 @@
/* Data for s390 version of processor capability information.
Copyright (C) 2006-2025 Free Software Foundation, Inc.
This file is part of the GNU C Library.
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
<https://www.gnu.org/licenses/>. */
#include <dl-procinfo.h>
const char _dl_s390_cap_flags[_DL_HWCAP_COUNT][9] =
{
"esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp", "edat", "etf3eh",
"highgprs", "te", "vx", "vxd", "vxe", "gs", "vxe2", "vxp", "sort", "dflt",
"vxp2", "nnpa", "pcimio", "sie"
};

3
sysdeps/s390/dl-procinfo.c
View file

@ -16,9 +16,6 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
/* The hwcap and platform strings are now in
sysdeps/s390/dl-procinfo-s390.c. */
/* Needed by sysdeps/unix/sysv/linux/dl-vdso-setup.c (as included from
sysdeps/generic/ldsodefs.h). */

72
sysdeps/s390/dl-procinfo.h
View file

@ -1,72 +0,0 @@
/* s390 version of processor capability information handling macros.
Copyright (C) 2006-2025 Free Software Foundation, Inc.
This file is part of the GNU C Library.
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
<https://www.gnu.org/licenses/>. */
#ifndef _DL_PROCINFO_H
#define _DL_PROCINFO_H 1
#include <ldsodefs.h>
#define _DL_HWCAP_COUNT 23
extern const char _dl_s390_cap_flags[_DL_HWCAP_COUNT][9] attribute_hidden;
/* Hardware capability bit numbers are derived directly from the
facility indications as stored by the "store facility list" (STFL)
instruction.
highgprs is an alien in that list. It describes a *kernel*
capability. */
enum
{
HWCAP_S390_ESAN3 = 1 << 0,
HWCAP_S390_ZARCH = 1 << 1,
HWCAP_S390_STFLE = 1 << 2,
HWCAP_S390_MSA = 1 << 3,
HWCAP_S390_LDISP = 1 << 4,
HWCAP_S390_EIMM = 1 << 5,
HWCAP_S390_DFP = 1 << 6,
HWCAP_S390_HPAGE = 1 << 7,
HWCAP_S390_ETF3EH = 1 << 8,
HWCAP_S390_HIGH_GPRS = 1 << 9,
HWCAP_S390_TE = 1 << 10,
HWCAP_S390_VX = 1 << 11,
HWCAP_S390_VXRS = HWCAP_S390_VX,
HWCAP_S390_VXD = 1 << 12,
HWCAP_S390_VXRS_BCD = HWCAP_S390_VXD,
HWCAP_S390_VXE = 1 << 13,
HWCAP_S390_VXRS_EXT = HWCAP_S390_VXE,
HWCAP_S390_GS = 1 << 14,
HWCAP_S390_VXRS_EXT2 = 1 << 15,
HWCAP_S390_VXRS_PDE = 1 << 16,
HWCAP_S390_SORT = 1 << 17,
HWCAP_S390_DFLT = 1 << 18,
HWCAP_S390_VXRS_PDE2 = 1 << 19,
HWCAP_S390_NNPA = 1 << 20,
HWCAP_S390_PCI_MIO = 1 << 21,
HWCAP_S390_SIE = 1 << 22,
};
/* We cannot provide a general printing function. */
#define _dl_procinfo(type, word) -1
static inline const char *
__attribute__ ((unused))
_dl_hwcap_string (int idx)
{
return _dl_s390_cap_flags[idx];
};
#endif /* dl-procinfo.h */

3
sysdeps/s390/multiarch/ifunc-resolve.h
View file

@ -18,8 +18,9 @@
<https://www.gnu.org/licenses/>. */
#include <unistd.h>
#include <dl-procinfo.h>
#include <cpu-features.h>
#include <ldsodefs.h>
#include <sys/auxv.h>
#define s390_libc_ifunc_expr_stfle_init() \
const unsigned long long *stfle_bits = features->stfle_bits;

1
sysdeps/s390/s390-32/dl-machine.h
View file

@ -24,7 +24,6 @@
#include <sys/param.h>
#include <string.h>
#include <link.h>
#include <sysdeps/s390/dl-procinfo.h>
#include <dl-irel.h>
#include <dl-static-tls.h>
#include <dl-machine-rel.h>

1
sysdeps/s390/s390-64/dl-hwcaps-subdirs.c
View file

@ -18,6 +18,7 @@
#include <dl-hwcaps.h>
#include <ldsodefs.h>
#include <sys/auxv.h>
const char _dl_hwcaps_subdirs[] = "z16:z15:z14:z13";
enum { subdirs_count = 4 }; /* Number of components in _dl_hwcaps_subdirs. */

1
sysdeps/s390/s390-64/dl-machine.h
View file

@ -25,7 +25,6 @@
#include <sys/param.h>
#include <string.h>
#include <link.h>
#include <sysdeps/s390/dl-procinfo.h>
#include <dl-irel.h>
#include <dl-static-tls.h>
#include <dl-machine-rel.h>

63
sysdeps/sparc/dl-procinfo.c
View file

@ -1,63 +0,0 @@
/* Data for Linux/sparc version of processor capability information.
Copyright (C) 2002-2025 Free Software Foundation, Inc.
This file is part of the GNU C Library.
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
<https://www.gnu.org/licenses/>. */
/* This information must be kept in sync with the _DL_HWCAP_COUNT
definition in procinfo.h.
If anything should be added here check whether the size of each string
is still ok with the given array size.
All the #ifdefs in the definitions ar equite irritating but
necessary if we want to avoid duplicating the information. There
are three different modes:
- PROCINFO_DECL is defined. This means we are only interested in
declarations.
- PROCINFO_DECL is not defined:
+ if SHARED is defined the file is included in an array
initializer. The .element = { ... } syntax is needed.
+ if SHARED is not defined a normal array initialization is
needed.
*/
#ifndef PROCINFO_CLASS
#define PROCINFO_CLASS
#endif
#if !defined PROCINFO_DECL && defined SHARED
._dl_sparc_cap_flags
#else
PROCINFO_CLASS const char _dl_sparc_cap_flags[28][11]
#endif
#ifndef PROCINFO_DECL
= { "flush", "stbar", "swap", "muldiv", "v9", "ultra3", "v9v", "v9v2",
"mul32", "div32", "fsmuld", "v8plus", "popc", "vis", "vis2",
"ASIBlkInit", "fmaf", "vis3", "hpc", "random", "trans", "fjfmau",
"ima", "cspare", "pause", "cbcond", "crypto", "adp" }
#endif
#if !defined SHARED || defined PROCINFO_DECL
;
#else
,
#endif
#undef PROCINFO_DECL
#undef PROCINFO_CLASS

55
sysdeps/sparc/dl-procinfo.h
View file

@ -1,55 +0,0 @@
/* Linux/sparc version of processor capability information handling macros.
Copyright (C) 1999-2025 Free Software Foundation, Inc.
This file is part of the GNU C Library.
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
<https://www.gnu.org/licenses/>. */
#ifndef _DL_PROCINFO_H
#define _DL_PROCINFO_H 1
#include <ldsodefs.h>
#include <sysdep.h>
#define _DL_HWCAP_COUNT 28
static inline int
__attribute__ ((unused))
_dl_procinfo (unsigned int type, unsigned long int word)
{
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 & (1 << i))
_dl_printf (" %s", GLRO(dl_sparc_cap_flags)[i]);
_dl_printf ("\n");
return 0;
}
static inline const char *
__attribute__ ((unused))
_dl_hwcap_string (int idx)
{
return GLRO(dl_sparc_cap_flags)[idx];
};
#endif /* dl-procinfo.h */

22
sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c
View file

@ -56,27 +56,5 @@ PROCINFO_CLASS struct cpu_features _dl_aarch64_cpu_features
# endif
#endif
/* Number of HWCAP bits set. */
#define _DL_HWCAP_COUNT 32
#if !defined PROCINFO_DECL && defined SHARED
._dl_aarch64_cap_flags
#else
PROCINFO_CLASS const char _dl_aarch64_cap_flags[_DL_HWCAP_COUNT][10]
#endif
#ifndef PROCINFO_DECL
/* Matches the names in arch/arm64/kernel/cpuinfo.c of Linux. */
= { "fp", "asimd", "evtstrm", "aes", "pmull", "sha1", "sha2", "crc32",
"atomics", "fphp", "asimdhp", "cpuid", "asimdrdm", "jscvt", "fcma",
"lrcpc", "dcpop", "sha3", "sm3", "sm4", "asimddp", "sha512", "sve",
"asimdfhm", "dit", "uscat", "ilrcpc", "flagm", "ssbs", "sb", "paca",
"pacg" }
#endif
#if !defined SHARED || defined PROCINFO_DECL
;
#else
,
#endif
#undef PROCINFO_DECL
#undef PROCINFO_CLASS

37
sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h
View file

@ -1,37 +0,0 @@
/* Processor capability information handling macros - aarch64 version.
Copyright (C) 2017-2025 Free Software Foundation, Inc.
This file is part of the GNU C Library.
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
<https://www.gnu.org/licenses/>. */
#ifndef _DL_PROCINFO_H
#define _DL_PROCINFO_H 1
#include <sys/auxv.h>
#include <unistd.h>
#include <ldsodefs.h>
#include <sysdep.h>
/* We cannot provide a general printing function. */
#define _dl_procinfo(type, word) -1
static inline const char *
__attribute__ ((unused))
_dl_hwcap_string (int idx)
{
return (unsigned)idx < _DL_HWCAP_COUNT ? GLRO(dl_aarch64_cap_flags)[idx] : "";
};
#endif /* dl-procinfo.h */

66
sysdeps/unix/sysv/linux/arm/dl-procinfo.c
View file

@ -1,66 +0,0 @@
/* Data for Linux/ARM version of processor capability information.
Copyright (C) 2001-2025 Free Software Foundation, Inc.
This file is part of the GNU C Library.
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
<https://www.gnu.org/licenses/>. */
/* This information must be kept in sync with the _DL_HWCAP_COUNT and
_DL_PLATFORM_COUNT definitions in procinfo.h.
If anything should be added here check whether the size of each string
is still ok with the given array size.
All the #ifdefs in the definitions are quite irritating but
necessary if we want to avoid duplicating the information. There
are three different modes:
- PROCINFO_DECL is defined. This means we are only interested in
declarations.
- PROCINFO_DECL is not defined:
+ if SHARED is defined the file is included in an array
initializer. The .element = { ... } syntax is needed.
+ if SHARED is not defined a normal array initialization is
needed.
*/
#ifndef PROCINFO_CLASS
#define PROCINFO_CLASS
#endif
#if !defined PROCINFO_DECL && defined SHARED
._dl_arm_cap_flags
#else
PROCINFO_CLASS const char _dl_arm_cap_flags[35][10]
#endif
#ifndef PROCINFO_DECL
= {
"swp", "half", "thumb", "26bit", "fastmult", "fpa", "vfp", "edsp",
"java", "iwmmxt", "crunch", "thumbee", "neon", "vfpv3", "vfpv3d16",
"tls", "vfpv4", "idiva", "idivt", "vfpd32", "lpae", "evtstrm",
"fphp", "asimdhp", "asimddp", "asimdfhm", "asimdbf16", "i8mm",
"aes", "pmull", "sha1", "sha2", "crc32", "sb", "ssbs",
}
#endif
#if !defined SHARED || defined PROCINFO_DECL
;
#else
,
#endif
#undef PROCINFO_DECL
#undef PROCINFO_CLASS

73
sysdeps/unix/sysv/linux/arm/dl-procinfo.h
View file

@ -1,73 +0,0 @@
/* Linux/ARM version of processor capability information handling macros.
Copyright (C) 2001-2025 Free Software Foundation, Inc.
This file is part of the GNU C Library.
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
<https://www.gnu.org/licenses/>. */
#ifndef _DL_PROCINFO_H
#define _DL_PROCINFO_H 1
#include <ldsodefs.h>
#include <sysdep.h>
#define _DL_HWCAP_COUNT 27
/* Low 28 bits are allocated in HWCAP. */
#define _DL_HWCAP_LAST 27
/* Low 7 bits are allocated in HWCAP2. */
#define _DL_HWCAP2_LAST 6
static inline const char *
__attribute__ ((unused))
_dl_hwcap_string (int idx)
{
return GLRO(dl_arm_cap_flags)[idx];
};
static inline int
__attribute__ ((unused))
_dl_procinfo (unsigned int type, unsigned long int word)
{
switch(type)
{
case AT_HWCAP:
_dl_printf ("AT_HWCAP: ");
for (int i = 0; i <= _DL_HWCAP_LAST; ++i)
if (word & (1 << i))
_dl_printf (" %s", _dl_hwcap_string (i));
break;
case AT_HWCAP2:
{
unsigned int offset = _DL_HWCAP_LAST + 1;
_dl_printf ("AT_HWCAP2: ");
for (int i = 0; i <= _DL_HWCAP2_LAST; ++i)
if (word & (1 << i))
_dl_printf (" %s", _dl_hwcap_string (offset + i));
break;
}
default:
/* Fallback to generic output mechanism. */
return -1;
}
_dl_printf ("\n");
return 0;
}
#endif /* dl-procinfo.h */

46
sysdeps/unix/sysv/linux/i386/dl-procinfo.h
View file

@ -1,46 +0,0 @@
/* Linux/i386 version of processor capability information handling macros.
Copyright (C) 1998-2025 Free Software Foundation, Inc.
This file is part of the GNU C Library.
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
<https://www.gnu.org/licenses/>. */
#ifndef _DL_I386_PROCINFO_H
#define _DL_I386_PROCINFO_H 1
#include <sysdeps/x86/dl-procinfo.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/i386/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 < 32; ++i)
if (word & (1 << i))
_dl_printf (" %s", GLRO(dl_x86_cap_flags)[i]);
_dl_printf ("\n");
return 0;
}
#endif

48
sysdeps/unix/sysv/linux/s390/dl-procinfo.h
View file

@ -1,48 +0,0 @@
/* Linux/s390 version of processor capability information handling macros.
Copyright (C) 2006-2025 Free Software Foundation, Inc.
This file is part of the GNU C Library.
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
<https://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", _dl_s390_cap_flags[i]);
_dl_printf ("\n");
return 0;
}
#endif

3
sysdeps/unix/sysv/linux/s390/elision-conf.c
View file

@ -20,7 +20,8 @@
#include <pthreadP.h>
#include <elision-conf.h>
#include <unistd.h>
#include <dl-procinfo.h>
#include <ldsodefs.h>
#include <sys/auxv.h>
#define TUNABLE_NAMESPACE elision
#include <elf/dl-tunables.h>

3
sysdeps/unix/sysv/linux/s390/sysconf.c
View file

@ -17,8 +17,9 @@
<https://www.gnu.org/licenses/>. */
#include <unistd.h>
#include <dl-procinfo.h>
#include <cpu-features.h>
#include <ldsodefs.h>
#include <sys/auxv.h>
static long int linux_sysconf (int name);

5
sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h
View file

@ -1,5 +0,0 @@
#if IS_IN (ldconfig)
# include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
#else
# include <sysdeps/x86/dl-procinfo.h>
#endif

7
sysdeps/x86/dl-hwcap.h
View file

@ -25,13 +25,6 @@ enum
HWCAP_X86_AVX512_1 = 1 << 2
};
static inline const char *
__attribute__ ((unused))
_dl_hwcap_string (int idx)
{
return GLRO(dl_x86_hwcap_flags)[idx];
};
/* We cannot provide a general printing function. */
#define _dl_procinfo(type, word) -1

16
sysdeps/x86/dl-procinfo.c
View file

@ -54,22 +54,6 @@ PROCINFO_CLASS struct cpu_features _dl_x86_cpu_features
# endif
#endif
#if !defined PROCINFO_DECL && defined SHARED
._dl_x86_hwcap_flags
#else
PROCINFO_CLASS const char _dl_x86_hwcap_flags[3][9]
#endif
#ifndef PROCINFO_DECL
= {
"sse2", "x86_64", "avx512_1"
}
#endif
#if !defined SHARED || defined PROCINFO_DECL
;
#else
,
#endif
#if defined SHARED && !IS_IN (ldconfig)
# if !defined PROCINFO_DECL
._dl_x86_tlsdesc_dynamic

26
sysdeps/x86/dl-procinfo.h
View file

@ -1,26 +0,0 @@
/* x86 version of processor capability information handling macros.
Copyright (C) 2017-2025 Free Software Foundation, Inc.
This file is part of the GNU C Library.
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
<https://www.gnu.org/licenses/>. */
#ifndef _DL_PROCINFO_H
#define _DL_PROCINFO_H 1
#include <ldsodefs.h>
#include <dl-hwcap.h>
#define _DL_HWCAP_COUNT HWCAP_COUNT
#endif /* dl-procinfo.h */