Remove dl-procinfo.h

powerpc was the only architecture with arch-specific hooks for
LD_SHOW_AUXV, and with the information moved to ld diagnostics there
is no need to keep the _dl_procinfo hook.

Checked with a build for all affected ABIs.

Reviewed-by: Peter Bergner <bergner@linux.ibm.com>

diff --git a/elf/dl-cache.c b/elf/dl-cache.c
index 300aa1b6dd884e0b72ea342551e3726f0e857cf9..f9ca40de3f66ef5c5a06ae1a2053902f38051161 100644 (file)
--- a/elf/dl-cache.c
+++ b/elf/dl-cache.c
@@ -21,7 +21,6 @@
 #include <ldsodefs.h>
 #include <sys/mman.h>
 #include <dl-cache.h>
-#include <dl-procinfo.h>
 #include <stdint.h>
 #include <_itoa.h>
 #include <dl-hwcaps.h>

diff --git a/elf/dl-diagnostics.c b/elf/dl-diagnostics.c
index fb2cfbeeb890b77fb3a265f2bf4d2a4e4402874d..abb644314db4fb30ba1d965e502d4f84ed7fb3ef 100644 (file)
--- a/elf/dl-diagnostics.c
+++ b/elf/dl-diagnostics.c
@@ -24,7 +24,6 @@
 #include <dl-diagnostics.h>
 #include <dl-hwcaps.h>
 #include <dl-main.h>
-#include <dl-procinfo.h>
 #include <dl-sysdep.h>
 #include <ldsodefs.h>
 #include "trusted-dirs.h"

diff --git a/elf/dl-hwcaps.c b/elf/dl-hwcaps.c
index e3d24fba1b9f83562cae09f0d4f410ac31bceacd..66060d7bb5b8540a90c4c88307d56056db394f7c 100644 (file)
--- a/elf/dl-hwcaps.c
+++ b/elf/dl-hwcaps.c
@@ -23,7 +23,6 @@
 #include <unistd.h>
 #include <ldsodefs.h>
 
-#include <dl-procinfo.h>
 #include <dl-hwcaps.h>
 
 /* This is the result of counting the substrings in a colon-separated

diff --git a/elf/dl-support.c b/elf/dl-support.c
index a7d5a5e8ab60ae0280637acd701e31a3c9804f03..c7860f327adaf6f22079b28583e60e935a6a9ebc 100644 (file)
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -35,7 +35,6 @@
 #include <dl-machine.h>
 #include <libc-lock.h>
 #include <dl-cache.h>
-#include <dl-procinfo.h>
 #include <unsecvars.h>
 #include <hp-timing.h>
 #include <stackinfo.h>

diff --git a/elf/dl-usage.c b/elf/dl-usage.c
index c6d13ac2eef28477da177bdc2bfa9e01e931cde1..31b27e5ea6cdc332d1c986fc576dbe0625559b92 100644 (file)
--- a/elf/dl-usage.c
+++ b/elf/dl-usage.c
@@ -22,7 +22,6 @@
 #include <unistd.h>
 #include "version.h"
 
-#include <dl-procinfo.h>
 #include <dl-hwcaps.h>
 
 void

diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index 1432187e9b3a14fae9679b59d7b4b9a744b0e51e..39b154c72c7a4966229f075f09d31e9c00d20d5d 100644 (file)
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -45,7 +45,6 @@
 #include <dl-hwcaps.h>
 #include <dl-is_dso.h>
 
-#include <dl-procinfo.h>
 
 #ifndef LD_SO_CONF
 # define LD_SO_CONF SYSCONFDIR "/ld.so.conf"

diff --git a/elf/rtld.c b/elf/rtld.c
index 115f1da37f364290bb2194d795299b1d57c3f033..00b25c1a733756a1c96cb9884f00f3b147a0f0ea 100644 (file)
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -35,7 +35,6 @@
 #include <unsecvars.h>
 #include <dl-cache.h>
 #include <dl-osinfo.h>
-#include <dl-procinfo.h>
 #include <dl-prop.h>
 #include <dl-vdso.h>
 #include <dl-vdso-setup.h>

diff --git a/scripts/gen-tunables.awk b/scripts/gen-tunables.awk
index d9f326b63b25805f1b616211bc1d60961b8a3c49..5d34075c16ce4df4e45b7ec7381215131731c87d 100644 (file)
--- a/scripts/gen-tunables.awk
+++ b/scripts/gen-tunables.awk
@@ -141,7 +141,6 @@ END {
   print "# error \"Do not include this file directly.\""
   print "# error \"Include tunables.h instead.\""
   print "#endif"
-  print "#include <dl-procinfo.h>\n"
 
   # Now, the enum names
   print "\ntypedef enum"

diff --git a/sysdeps/generic/dl-procinfo.h b/sysdeps/generic/dl-procinfo.h
deleted file mode 100644 (file)
index 057a4ae..0000000
--- a/sysdeps/generic/dl-procinfo.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Stub 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_PROCINFO_H
-#define _DL_PROCINFO_H 1
-
-/* We cannot provide a general printing function.  */
-#define _dl_procinfo(type, word) -1
-
-#endif /* dl-procinfo.h */

diff --git a/sysdeps/i386/fpu/fclrexcpt.c b/sysdeps/i386/fpu/fclrexcpt.c
index 2254c49d60b56536eab0fa678e73696a1a1a7398..f7a2ed2be1c8cd629c81563251ed5f3baec4f339 100644 (file)
--- a/sysdeps/i386/fpu/fclrexcpt.c
+++ b/sysdeps/i386/fpu/fclrexcpt.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <unistd.h>
 #include <ldsodefs.h>
-#include <dl-procinfo.h>
 
 int
 __feclearexcept (int excepts)

diff --git a/sysdeps/i386/fpu/fedisblxcpt.c b/sysdeps/i386/fpu/fedisblxcpt.c
index 305758a267117ef7e3b0d526fa36ff1fed0b6a0b..b23fd8e8692bd9b0bad3d2457d6d7b2735c070ce 100644 (file)
--- a/sysdeps/i386/fpu/fedisblxcpt.c
+++ b/sysdeps/i386/fpu/fedisblxcpt.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <unistd.h>
 #include <ldsodefs.h>
-#include <dl-procinfo.h>
 
 int
 fedisableexcept (int excepts)

diff --git a/sysdeps/i386/fpu/feenablxcpt.c b/sysdeps/i386/fpu/feenablxcpt.c
index e24d9d5f98dd714a59bc5ad57961f00c9d4816a5..bc4a4ce32fc9920a6779e603086b2968ebe22310 100644 (file)
--- a/sysdeps/i386/fpu/feenablxcpt.c
+++ b/sysdeps/i386/fpu/feenablxcpt.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <unistd.h>
 #include <ldsodefs.h>
-#include <dl-procinfo.h>
 
 int
 feenableexcept (int excepts)

diff --git a/sysdeps/i386/fpu/fegetenv.c b/sysdeps/i386/fpu/fegetenv.c
index 3c58ea6ef151049ebe3446a6601a77a00c6b5b98..0d2b87db9359880f8f31dfbd079d738da92a0387 100644 (file)
--- a/sysdeps/i386/fpu/fegetenv.c
+++ b/sysdeps/i386/fpu/fegetenv.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <unistd.h>
 #include <ldsodefs.h>
-#include <dl-procinfo.h>
 
 int
 __fegetenv (fenv_t *envp)

diff --git a/sysdeps/i386/fpu/fegetmode.c b/sysdeps/i386/fpu/fegetmode.c
index ff3f98834fd32b99d98dfcab2c0b00de6b9a8829..41275e1036bcf85eec0249d40aa80288e0cf87f8 100644 (file)
--- a/sysdeps/i386/fpu/fegetmode.c
+++ b/sysdeps/i386/fpu/fegetmode.c
@@ -20,7 +20,6 @@
 #include <fpu_control.h>
 #include <unistd.h>
 #include <ldsodefs.h>
-#include <dl-procinfo.h>
 
 int
 fegetmode (femode_t *modep)

diff --git a/sysdeps/i386/fpu/feholdexcpt.c b/sysdeps/i386/fpu/feholdexcpt.c
index 3b689b97c967c349189d3785a237c8bcd1f15093..a323a04f27851882b626c2b9fd31908de775538c 100644 (file)
--- a/sysdeps/i386/fpu/feholdexcpt.c
+++ b/sysdeps/i386/fpu/feholdexcpt.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <unistd.h>
 #include <ldsodefs.h>
-#include <dl-procinfo.h>
 
 int
 __feholdexcept (fenv_t *envp)

diff --git a/sysdeps/i386/fpu/fesetenv.c b/sysdeps/i386/fpu/fesetenv.c
index 06d78484e9962d24a4df46c939ffde547edc72c0..66d7002edd3e440385fea278ab1ef538aba0eb91 100644 (file)
--- a/sysdeps/i386/fpu/fesetenv.c
+++ b/sysdeps/i386/fpu/fesetenv.c
@@ -21,7 +21,6 @@
 #include <assert.h>
 #include <unistd.h>
 #include <ldsodefs.h>
-#include <dl-procinfo.h>
 
 
 /* All exceptions, including the x86-specific "denormal operand"

diff --git a/sysdeps/i386/fpu/fesetmode.c b/sysdeps/i386/fpu/fesetmode.c
index 33e85ecfa66040a9b482f265bea1415ab5efc77d..eab0a5d68386f57c2aca59f0350b4c718cc57ee0 100644 (file)
--- a/sysdeps/i386/fpu/fesetmode.c
+++ b/sysdeps/i386/fpu/fesetmode.c
@@ -20,7 +20,6 @@
 #include <fpu_control.h>
 #include <unistd.h>
 #include <ldsodefs.h>
-#include <dl-procinfo.h>
 
 /* All exceptions, including the x86-specific "denormal operand"
    exception.  */

diff --git a/sysdeps/i386/fpu/fesetround.c b/sysdeps/i386/fpu/fesetround.c
index ef6fc3af1b7d9d19f059b775618d50271771f223..ea1f9096b520b6b79ffa2638a84c8364d8f49164 100644 (file)
--- a/sysdeps/i386/fpu/fesetround.c
+++ b/sysdeps/i386/fpu/fesetround.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <unistd.h>
 #include <ldsodefs.h>
-#include <dl-procinfo.h>
 
 int
 __fesetround (int round)

diff --git a/sysdeps/i386/fpu/feupdateenv.c b/sysdeps/i386/fpu/feupdateenv.c
index 38ae5f49935bf59863808a68792ac679c478bb08..89b000953a5f1e30803c4fc454172fae0ba86d0d 100644 (file)
--- a/sysdeps/i386/fpu/feupdateenv.c
+++ b/sysdeps/i386/fpu/feupdateenv.c
@@ -18,7 +18,6 @@
 
 #include <fenv.h>
 #include <unistd.h>
-#include <dl-procinfo.h>
 #include <ldsodefs.h>
 
 int

diff --git a/sysdeps/i386/fpu/fgetexcptflg.c b/sysdeps/i386/fpu/fgetexcptflg.c
index f4c7765bebeadc817e30206e33ca6a62258ff1dc..be181af162221a754b9c556429071ddf94dfad46 100644 (file)
--- a/sysdeps/i386/fpu/fgetexcptflg.c
+++ b/sysdeps/i386/fpu/fgetexcptflg.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <unistd.h>
 #include <ldsodefs.h>
-#include <dl-procinfo.h>
 
 
 int

diff --git a/sysdeps/i386/fpu/ftestexcept.c b/sysdeps/i386/fpu/ftestexcept.c
index 25cb027200bf848501d0b31eca35812547926fd3..2d41ba22acac742ffec8fca23b8adfbe9e529e0c 100644 (file)
--- a/sysdeps/i386/fpu/ftestexcept.c
+++ b/sysdeps/i386/fpu/ftestexcept.c
@@ -18,7 +18,6 @@
 
 #include <fenv.h>
 #include <unistd.h>
-#include <dl-procinfo.h>
 #include <ldsodefs.h>
 
 int

diff --git a/sysdeps/i386/setfpucw.c b/sysdeps/i386/setfpucw.c
index df8fffc6f2ee29d0b05953b2d8225cc7c4a19986..1edfd5be0aca3258f874e72f07b72eda300b45bb 100644 (file)
--- a/sysdeps/i386/setfpucw.c
+++ b/sysdeps/i386/setfpucw.c
@@ -21,7 +21,6 @@
 #include <fenv.h>
 #include <unistd.h>
 #include <ldsodefs.h>
-#include <dl-procinfo.h>
 
 void
 __setfpucw (fpu_control_t set)

diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index 173499c4c1fe8d3d301db55e33bc8b55468cb36c..e6294925833415e9da283b2193fcce5a0e8fe3f5 100644 (file)
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -43,7 +43,6 @@
 
 #include <entry.h>
 #include <dl-machine.h>
-#include <dl-procinfo.h>
 
 #include <dl-tunables.h>
 #include <not-errno.h>

diff --git a/sysdeps/powerpc/fpu/math_private.h b/sysdeps/powerpc/fpu/math_private.h
index 7065d276c0f719bde9e4686f2250f5b20ea2a5ca..a87ed62c42dde0aaf65ec457969f29868087f027 100644 (file)
--- a/sysdeps/powerpc/fpu/math_private.h
+++ b/sysdeps/powerpc/fpu/math_private.h
@@ -21,7 +21,6 @@
 
 #include <sysdep.h>
 #include <ldsodefs.h>
-#include <dl-procinfo.h>
 
 #include_next <math_private.h>
 

diff --git a/sysdeps/powerpc/hwcapinfo.c b/sysdeps/powerpc/hwcapinfo.c
index ca9277bb1e00b3a81eab671c3730a222b90163b9..72e65ac7a0608f93e41723870cb3a27bbbfc67f9 100644 (file)
--- a/sysdeps/powerpc/hwcapinfo.c
+++ b/sysdeps/powerpc/hwcapinfo.c
@@ -18,7 +18,6 @@
 
 #include <unistd.h>
 #include <shlib-compat.h>
-#include <dl-procinfo.h>
 #include <cpu-features.c>
 
 tcbhead_t __tcb __attribute__ ((visibility ("hidden")));

diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.c b/sysdeps/unix/sysv/linux/dl-sysdep.c
index b746ac264485f21bdf7133f860a5d7bc6ee62f4f..544902e6d2ace057830f560d17a4ef67a6128eeb 100644 (file)
--- a/sysdeps/unix/sysv/linux/dl-sysdep.c
+++ b/sysdeps/unix/sysv/linux/dl-sysdep.c
@@ -21,7 +21,6 @@
 #include <dl-auxv.h>
 #include <dl-osinfo.h>
 #include <dl-parse_auxv.h>
-#include <dl-procinfo.h>
 #include <dl-tunables.h>
 #include <elf.h>
 #include <errno.h>
@@ -222,10 +221,6 @@ _dl_show_auxv (void)
       assert (AT_NULL == 0);
       assert (AT_IGNORE == 1);
 
-      /* 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/unix/sysv/linux/powerpc/elision-conf.c b/sysdeps/unix/sysv/linux/powerpc/elision-conf.c
index fe98c6ba71d0e3ad3625910e03f9986a3f1de170..451897bd3d14dbe6f141abb2841f7d2041b4edde 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/elision-conf.c
+++ b/sysdeps/unix/sysv/linux/powerpc/elision-conf.c
@@ -20,7 +20,6 @@
 #include <pthreadP.h>
 #include <elision-conf.h>
 #include <unistd.h>
-#include <dl-procinfo.h>
 #include <ldsodefs.h>
 
 #define TUNABLE_NAMESPACE elision

diff --git a/sysdeps/x86/dl-hwcap.h b/sysdeps/x86/dl-hwcap.h
index 2384897e6025735ab1dd4ef899d45f219e9c3032..d48240843e8467b01630f4c98a663d7e4b9bff16 100644 (file)
--- a/sysdeps/x86/dl-hwcap.h
+++ b/sysdeps/x86/dl-hwcap.h
@@ -25,7 +25,4 @@ enum
   HWCAP_X86_AVX512_1           = 1 << 2
 };
 
-/* We cannot provide a general printing function.  */
-#define _dl_procinfo(type, word) -1
-
 #endif /* dl-hwcap.h */