elf: Replace PI_STATIC_AND_HIDDEN with opposite HIDDEN_VAR_NEEDS_DYNAMIC_RELOC

PI_STATIC_AND_HIDDEN indicates whether accesses to internal linkage
variables and hidden visibility variables in a shared object (ld.so)
need dynamic relocations (usually R_*_RELATIVE). PI (position
independent) in the macro name is a misnomer: a code sequence using GOT
is typically position-independent as well, but using dynamic relocations
does not meet the requirement.

Not defining PI_STATIC_AND_HIDDEN is legacy and we expect that all new
ports will define PI_STATIC_AND_HIDDEN. Current ports defining
PI_STATIC_AND_HIDDEN are more than the opposite. Change the configure
default.

No functional change.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

diff --git a/config.h.in b/config.h.in
index a94f7568597e17d1fe1a0ea2eabc280344401713..916465fce81f1eb60f3f6352169892791de5b7f8 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -84,9 +84,9 @@
 /* Define if the compiler\'s exception support is based on libunwind.  */
 #undef HAVE_CC_WITH_LIBUNWIND
 
-/* Define if the access to static and hidden variables is position independent
-   and does not need relocations.  */
-#undef PI_STATIC_AND_HIDDEN
+/* Define if the accesses to static and hidden variables in a shared object
+   need dynamic relocations.  */
+#undef HIDDEN_VAR_NEEDS_DYNAMIC_RELOC
 
 /* Define this to disable the 'hidden_proto' et al macros in
    include/libc-symbols.h that avoid PLT slots in PIE.  */

diff --git a/elf/rtld.c b/elf/rtld.c
index 93180466d6f0a9ca74727d5dd9931002b7e6f6e6..be6daa1c4432f379a77e19fd76a13e491fe6de75 100644 (file)
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -424,7 +424,7 @@ DL_SYSINFO_IMPLEMENTATION
    is fine, too.  The latter is important here.  We can avoid setting
    up a temporary link map for ld.so if we can mark _rtld_global as
    hidden.  */
-#ifdef PI_STATIC_AND_HIDDEN
+#ifndef HIDDEN_VAR_NEEDS_DYNAMIC_RELOC
 # define DONT_USE_BOOTSTRAP_MAP        1
 #endif
 

diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure
index 4c1fac49f3ef9a4f3d7a2e6b714e80ea45aaaea1..bf972122b199e1dd7ef04c58dee99ed864274174 100644 (file)
--- a/sysdeps/aarch64/configure
+++ b/sysdeps/aarch64/configure
@@ -1,11 +1,6 @@
 # This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/aarch64.
 
-# Static and hidden objects are accessed without dynamic relocations.
-# The exception is -mcmodel=large which is unsupported with PIC/PIE.
-$as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h
-
-
 # Static PIE is supported.
 $as_echo "#define SUPPORT_STATIC_PIE 1" >>confdefs.h
 

diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac
index 3347c13fa1b6bca929b3afdb7bcce0d9140f5bf3..51253d98025b6f5956575558e459d72e0763c674 100644 (file)
--- a/sysdeps/aarch64/configure.ac
+++ b/sysdeps/aarch64/configure.ac
@@ -1,10 +1,6 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/aarch64.
 
-# Static and hidden objects are accessed without dynamic relocations.
-# The exception is -mcmodel=large which is unsupported with PIC/PIE.
-AC_DEFINE(PI_STATIC_AND_HIDDEN)
-
 # Static PIE is supported.
 AC_DEFINE(SUPPORT_STATIC_PIE)
 

diff --git a/sysdeps/alpha/configure b/sysdeps/alpha/configure
index 3d665d96f2b40c4ee144c012c5431b837c525dde..f67a0e20a93103281be35338301994ee19ff6f7c 100644 (file)
--- a/sysdeps/alpha/configure
+++ b/sysdeps/alpha/configure
@@ -1,11 +1,6 @@
 # This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/alpha.
 
-# With required gcc+binutils, we can always access static and hidden
-# symbols in a position independent way.
-$as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h
-
-
 # PIE builds fail on binutils 2.37 and earlier, see:
 # https://sourceware.org/bugzilla/show_bug.cgi?id=28672
 $as_echo "#define PIE_UNSUPPORTED 1" >>confdefs.h

diff --git a/sysdeps/alpha/configure.ac b/sysdeps/alpha/configure.ac
index 8f9a39ed2e4a29cbc625e7b9cf83c5d143ed88c6..465665def0a656f5811e8c046b328c70363eb1d1 100644 (file)
--- a/sysdeps/alpha/configure.ac
+++ b/sysdeps/alpha/configure.ac
@@ -1,10 +1,6 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/alpha.
 
-# With required gcc+binutils, we can always access static and hidden
-# symbols in a position independent way.
-AC_DEFINE(PI_STATIC_AND_HIDDEN)
-
 # PIE builds fail on binutils 2.37 and earlier, see:
 # https://sourceware.org/bugzilla/show_bug.cgi?id=28672
 AC_DEFINE(PIE_UNSUPPORTED)

diff --git a/sysdeps/arc/configure b/sysdeps/arc/configure
index bce7d3c3773ddf11e05139539e20d4c4555525e6..92050f44e30978ed7a6783531ababda355523cd3 100644 (file)
--- a/sysdeps/arc/configure
+++ b/sysdeps/arc/configure
@@ -1,8 +1,6 @@
 # This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/arc.
 
-$as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h
-
 libc_cv_have_sdata_section=no
 
 # For ARC, historically ; was used for comments and not newline

diff --git a/sysdeps/arc/configure.ac b/sysdeps/arc/configure.ac
index cb490e47b3561820dc45c325a0f42bcc5e7042ff..619da4e08847adb141f9750453eb5de6ffac3aea 100644 (file)
--- a/sysdeps/arc/configure.ac
+++ b/sysdeps/arc/configure.ac
@@ -1,7 +1,6 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/arc.
 
-AC_DEFINE(PI_STATIC_AND_HIDDEN)
 libc_cv_have_sdata_section=no
 
 # For ARC, historically ; was used for comments and not newline

diff --git a/sysdeps/arm/configure b/sysdeps/arm/configure
index 431e843b2b51694b84b14257b8a339b262840a64..b40ce60461aa5e5c5533bf040f795b84299b4678 100644 (file)
--- a/sysdeps/arm/configure
+++ b/sysdeps/arm/configure
@@ -1,9 +1,6 @@
 # This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/arm.
 
-$as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h
-
-
 # We check to see if the compiler and flags are
 # selecting the hard-float ABI and if they are then
 # we set libc_cv_arm_pcs_vfp to yes which causes

diff --git a/sysdeps/arm/configure.ac b/sysdeps/arm/configure.ac
index 90cdd69c7571e012a65b43775e4e3f6b2f8f15cc..da078ce0126c66153b982463a30d29b6fb2bcef9 100644 (file)
--- a/sysdeps/arm/configure.ac
+++ b/sysdeps/arm/configure.ac
@@ -1,11 +1,6 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/arm.
 
-dnl It is always possible to access static and hidden symbols in an
-dnl position independent way.  This has been true since GCC 4.1,
-dnl which is older than the minimum version required to build libc.
-AC_DEFINE(PI_STATIC_AND_HIDDEN)
-
 # We check to see if the compiler and flags are
 # selecting the hard-float ABI and if they are then
 # we set libc_cv_arm_pcs_vfp to yes which causes

diff --git a/sysdeps/csky/configure b/sysdeps/csky/configure
index 27464eb707ebd6c615afd590d839ec71ffc0a641..bcbcea089a4e0def916219a07224370a7e266706 100644 (file)
--- a/sysdeps/csky/configure
+++ b/sysdeps/csky/configure
@@ -1,9 +1,6 @@
 # This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/csky.
 
-$as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h
-
-
 # PIE builds fail on binutils 2.37 and earlier, see:
 # https://sourceware.org/bugzilla/show_bug.cgi?id=28672
 $as_echo "#define PIE_UNSUPPORTED 1" >>confdefs.h

diff --git a/sysdeps/csky/configure.ac b/sysdeps/csky/configure.ac
index 8e008249094d9e5af496a8351e4ea6d4511be9bd..ffd8c1ca9c5ba9579d3a50d044cdbe0439a74352 100644 (file)
--- a/sysdeps/csky/configure.ac
+++ b/sysdeps/csky/configure.ac
@@ -1,8 +1,6 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/csky.
 
-AC_DEFINE(PI_STATIC_AND_HIDDEN)
-
 # PIE builds fail on binutils 2.37 and earlier, see:
 # https://sourceware.org/bugzilla/show_bug.cgi?id=28672
 AC_DEFINE(PIE_UNSUPPORTED)

diff --git a/sysdeps/hppa/configure b/sysdeps/hppa/configure
index cf5acf966dad67ba5d8751133e3e682687b58b93..ebb42c592c9df420491932b134365f72f825aca1 100644 (file)
--- a/sysdeps/hppa/configure
+++ b/sysdeps/hppa/configure
@@ -32,6 +32,9 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+$as_echo "#define HIDDEN_VAR_NEEDS_DYNAMIC_RELOC 1" >>confdefs.h
+
+
 # PIE builds fail on binutils 2.37 and earlier, see:
 # https://sourceware.org/bugzilla/show_bug.cgi?id=28672
 $as_echo "#define PIE_UNSUPPORTED 1" >>confdefs.h

diff --git a/sysdeps/hppa/configure.ac b/sysdeps/hppa/configure.ac
index 3e1c35bbd992f54882139ef480e9168dc6c8335a..5e59a63f9a5983458d53e4e647e34a4b37246a39 100644 (file)
--- a/sysdeps/hppa/configure.ac
+++ b/sysdeps/hppa/configure.ac
@@ -20,6 +20,8 @@ fi
 rm -f conftest*])
 AC_DEFINE_UNQUOTED(ASM_LINE_SEP, $libc_cv_asm_line_sep)
 
+AC_DEFINE(HIDDEN_VAR_NEEDS_DYNAMIC_RELOC)
+
 # PIE builds fail on binutils 2.37 and earlier, see:
 # https://sourceware.org/bugzilla/show_bug.cgi?id=28672
 AC_DEFINE(PIE_UNSUPPORTED)

diff --git a/sysdeps/ia64/configure b/sysdeps/ia64/configure
index 748cb526012adeb856e142a0e7740b59b49d6d6c..90be9c0266166505411d011abcdaccc1115e46f2 100644 (file)
--- a/sysdeps/ia64/configure
+++ b/sysdeps/ia64/configure
@@ -1,9 +1,6 @@
 # This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/ia64.
 
-$as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h
-
-
 # PIE builds fail on binutils 2.37 and earlier, see:
 # https://sourceware.org/bugzilla/show_bug.cgi?id=28672
 $as_echo "#define PIE_UNSUPPORTED 1" >>confdefs.h

diff --git a/sysdeps/ia64/configure.ac b/sysdeps/ia64/configure.ac
index 8e5fba32c3ec8bfcba3f0aeb3443653d9f385f0f..6958c26415665404b4be3306838c12af7a8e9460 100644 (file)
--- a/sysdeps/ia64/configure.ac
+++ b/sysdeps/ia64/configure.ac
@@ -1,10 +1,6 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/ia64.
 
-dnl It is always possible to access static and hidden symbols in an
-dnl position independent way.
-AC_DEFINE(PI_STATIC_AND_HIDDEN)
-
 # PIE builds fail on binutils 2.37 and earlier, see:
 # https://sourceware.org/bugzilla/show_bug.cgi?id=28672
 AC_DEFINE(PIE_UNSUPPORTED)

diff --git a/sysdeps/m68k/configure b/sysdeps/m68k/configure
new file mode 100644 (file)
index 0000000..983836a
--- /dev/null
+++ b/sysdeps/m68k/configure
@@ -0,0 +1,7 @@
+# This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
+ # Local configure fragment for sysdeps/m68k.
+
+# Accessing static and hidden variables in a shared object needs relative
+# relocation.
+$as_echo "#define HIDDEN_VAR_NEEDS_DYNAMIC_RELOC 1" >>confdefs.h
+

diff --git a/sysdeps/m68k/configure.ac b/sysdeps/m68k/configure.ac
new file mode 100644 (file)
index 0000000..1c373b1
--- /dev/null
+++ b/sysdeps/m68k/configure.ac
@@ -0,0 +1,6 @@
+GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
+# Local configure fragment for sysdeps/m68k.
+
+# Accessing static and hidden variables in a shared object needs relative
+# relocation.
+AC_DEFINE(HIDDEN_VAR_NEEDS_DYNAMIC_RELOC)

diff --git a/sysdeps/microblaze/configure b/sysdeps/microblaze/configure
index e6652562d212b68892b5c7af3ab5d3f835fcbd88..b5306339df4e518ea17c72239fd85028bc03b3cf 100755 (executable)
--- a/sysdeps/microblaze/configure
+++ b/sysdeps/microblaze/configure
@@ -1,6 +1,9 @@
 # This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/microblaze.
 
+$as_echo "#define HIDDEN_VAR_NEEDS_DYNAMIC_RELOC 1" >>confdefs.h
+
+
 # gcc 11.2.1 and earlier crash with an internal compiler error, see:
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103613
 $as_echo "#define PIE_UNSUPPORTED 1" >>confdefs.h

diff --git a/sysdeps/microblaze/configure.ac b/sysdeps/microblaze/configure.ac
index 1c58f70a7bdfebcb4bdd562659f5d896aff8eec5..0b451df1118c1512bbe27761f9c8c23d95b93bde 100644 (file)
--- a/sysdeps/microblaze/configure.ac
+++ b/sysdeps/microblaze/configure.ac
@@ -1,6 +1,8 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/microblaze.
 
+AC_DEFINE(HIDDEN_VAR_NEEDS_DYNAMIC_RELOC)
+
 # gcc 11.2.1 and earlier crash with an internal compiler error, see:
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103613
 AC_DEFINE(PIE_UNSUPPORTED)

diff --git a/sysdeps/mips/configure b/sysdeps/mips/configure
index 4e13248c03f80840acb5995f2751f7ee85b09ddd..3f4d9e9759df4c91342dbc8ddc0b286d90664554 100644 (file)
--- a/sysdeps/mips/configure
+++ b/sysdeps/mips/configure
@@ -1,6 +1,8 @@
 # This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/mips.
 
+$as_echo "#define HIDDEN_VAR_NEEDS_DYNAMIC_RELOC 1" >>confdefs.h
+
 
 
 

diff --git a/sysdeps/mips/configure.ac b/sysdeps/mips/configure.ac
index bcbdaffd9fe3b427ec73b4a15b2968448824ca43..d3cd780d781f44e8d6d91825c1271c8252f6bad6 100644 (file)
--- a/sysdeps/mips/configure.ac
+++ b/sysdeps/mips/configure.ac
@@ -3,7 +3,7 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 
 dnl No MIPS GCC supports accessing static and hidden symbols in an
 dnl position independent way.
-dnl AC_DEFINE(PI_STATIC_AND_HIDDEN)
+AC_DEFINE(HIDDEN_VAR_NEEDS_DYNAMIC_RELOC)
 
 AC_CACHE_CHECK([whether the compiler is using the 2008 NaN encoding],
   libc_cv_mips_nan2008, [AC_EGREP_CPP(yes, [dnl

diff --git a/sysdeps/nios2/configure b/sysdeps/nios2/configure
index 14c8a3a014c17b61d3ae1d430fd28456acf8558f..b3cd28349e9bc54af79cd78ddbf790bae16a2954 100644 (file)
--- a/sysdeps/nios2/configure
+++ b/sysdeps/nios2/configure
@@ -160,3 +160,6 @@ $as_echo "$libc_cv_nios2_be" >&6; }
 if test $libc_cv_nios2_be = yes; then
   as_fn_error $? "Big endian not supported for Nios II" "$LINENO" 5
 fi
+
+$as_echo "#define HIDDEN_VAR_NEEDS_DYNAMIC_RELOC 1" >>confdefs.h
+

diff --git a/sysdeps/nios2/configure.ac b/sysdeps/nios2/configure.ac
index f05f43802bae94e388d1cfe318da93085c9fe500..f738e9a7ed176903c86d4efa2a1e2f23afa36c8f 100644 (file)
--- a/sysdeps/nios2/configure.ac
+++ b/sysdeps/nios2/configure.ac
@@ -11,3 +11,5 @@ AC_CACHE_CHECK([for big endian],
 if test $libc_cv_nios2_be = yes; then
   AC_MSG_ERROR([Big endian not supported for Nios II])
 fi
+
+AC_DEFINE(HIDDEN_VAR_NEEDS_DYNAMIC_RELOC)

diff --git a/sysdeps/or1k/configure b/sysdeps/or1k/configure
index 1fe508c44795795e70f90178dd48fbee5a9646ab..16146a8403568aa4a9578afebd669dbf4163d966 100644 (file)
--- a/sysdeps/or1k/configure
+++ b/sysdeps/or1k/configure
@@ -1,5 +1,2 @@
 # This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/or1k.
-
-$as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h
-

diff --git a/sysdeps/or1k/configure.ac b/sysdeps/or1k/configure.ac
index 76ff97dc9acfed5f8583d0bb3c7095f9af59d55c..b0214c6d84bfd89e75fba15352703234adcdf8c0 100644 (file)
--- a/sysdeps/or1k/configure.ac
+++ b/sysdeps/or1k/configure.ac
@@ -1,4 +1,2 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/or1k.
-
-AC_DEFINE(PI_STATIC_AND_HIDDEN)

diff --git a/sysdeps/powerpc/powerpc32/configure b/sysdeps/powerpc/powerpc32/configure
index 29cfd53e8b6f6234275703a4cc8a3a598b291d7a..551505327a0b8aaa2ca038f5319baa9e6fb5ef6d 100644 (file)
--- a/sysdeps/powerpc/powerpc32/configure
+++ b/sysdeps/powerpc/powerpc32/configure
@@ -1,6 +1,9 @@
 # This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/powerpc/powerpc32.
 
+$as_echo "#define HIDDEN_VAR_NEEDS_DYNAMIC_RELOC 1" >>confdefs.h
+
+
 # See whether GCC uses -msecure-plt.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -msecure-plt by default" >&5
 $as_echo_n "checking for -msecure-plt by default... " >&6; }

diff --git a/sysdeps/powerpc/powerpc32/configure.ac b/sysdeps/powerpc/powerpc32/configure.ac
index 5d3a9b509d9ac1c89184a8a27eb14174ddd3ccc1..2f0ea63e0d417449d47438edc37c84e57a725f34 100644 (file)
--- a/sysdeps/powerpc/powerpc32/configure.ac
+++ b/sysdeps/powerpc/powerpc32/configure.ac
@@ -1,6 +1,8 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/powerpc/powerpc32.
 
+AC_DEFINE(HIDDEN_VAR_NEEDS_DYNAMIC_RELOC)
+
 # See whether GCC uses -msecure-plt.
 AC_CACHE_CHECK(for -msecure-plt by default, libc_cv_ppc_secure_plt, [dnl
 echo 'int foo (void) { extern int bar; return bar; }' > conftest.c

diff --git a/sysdeps/powerpc/powerpc64/configure b/sysdeps/powerpc/powerpc64/configure
index fddea0355abde4637e1ed6fa0fdb79b7b0712e1f..f57c58ac1102a0d2b7e4504b9a01babfba5f0a53 100644 (file)
--- a/sysdeps/powerpc/powerpc64/configure
+++ b/sysdeps/powerpc/powerpc64/configure
@@ -1,6 +1,9 @@
 # This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/powerpc/powerpc64.
 
+$as_echo "#define HIDDEN_VAR_NEEDS_DYNAMIC_RELOC 1" >>confdefs.h
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for support for overlapping .opd entries" >&5
 $as_echo_n "checking for support for overlapping .opd entries... " >&6; }
 if ${libc_cv_overlapping_opd+:} false; then :

diff --git a/sysdeps/powerpc/powerpc64/configure.ac b/sysdeps/powerpc/powerpc64/configure.ac
index 1f3d54414cc2afeedcb744f58f8efa675cdd6257..111a0ae4b39bdde1be41515209da6a1900a0b8ce 100644 (file)
--- a/sysdeps/powerpc/powerpc64/configure.ac
+++ b/sysdeps/powerpc/powerpc64/configure.ac
@@ -1,6 +1,8 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/powerpc/powerpc64.
 
+AC_DEFINE(HIDDEN_VAR_NEEDS_DYNAMIC_RELOC)
+
 AC_CACHE_CHECK(for support for overlapping .opd entries,
 libc_cv_overlapping_opd, [dnl
 libc_cv_overlapping_opd=no

diff --git a/sysdeps/powerpc/tst-tlsifunc.c b/sysdeps/powerpc/tst-tlsifunc.c
index 6b256c6229dfb733222f4196c7e3793c05b6e46e..8e559b575d055667b4145f95c04c6f9d43500b7a 100644 (file)
--- a/sysdeps/powerpc/tst-tlsifunc.c
+++ b/sysdeps/powerpc/tst-tlsifunc.c
@@ -102,7 +102,7 @@ do_test (void)
   if (&bar == bar_ptr)
     printf ("PASS: bar address read from IFUNC resolver is correct.\n");
 #if !defined TST_TLSIFUNC_STATIC || !defined PIC \
-    || !defined PI_STATIC_AND_HIDDEN
+    || defined HIDDEN_VAR_NEEDS_DYNAMIC_RELOC
   else
     {
       printf ("FAIL: bar address read from IFUNC resolver is incorrect.\n");

diff --git a/sysdeps/riscv/configure b/sysdeps/riscv/configure
index 4a56fca94baa2c42ce19168740b500bf23f07f29..2372225a260b9476a8a9a258980b42f3ad462578 100644 (file)
--- a/sysdeps/riscv/configure
+++ b/sysdeps/riscv/configure
@@ -1,9 +1,6 @@
 # This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/riscv/elf.
 
-$as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h
-
-
 # Check if static linker supports R_RISCV_ALIGN
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for R_RISCV_ALIGN linker relaxation support" >&5
 $as_echo_n "checking for R_RISCV_ALIGN linker relaxation support... " >&6; }

diff --git a/sysdeps/riscv/configure.ac b/sysdeps/riscv/configure.ac
index 44a5279903ec3f2f4dcac53a56fa83e1ab939269..dbcc21668906f3611269eceba53f62f21492890b 100644 (file)
--- a/sysdeps/riscv/configure.ac
+++ b/sysdeps/riscv/configure.ac
@@ -1,8 +1,6 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/riscv/elf.
 
-AC_DEFINE(PI_STATIC_AND_HIDDEN)
-
 # Check if static linker supports R_RISCV_ALIGN
 AC_CACHE_CHECK([for R_RISCV_ALIGN linker relaxation support], [libc_cv_riscv_r_align],[dnl
   cat > conftest.S <<EOF

diff --git a/sysdeps/s390/configure b/sysdeps/s390/configure
index 431088acadfd2e2f45d171e3c1708268147cf7a3..cc68cbbb031f79d6d45463cc510e0f9ae21e2fe5 100644 (file)
--- a/sysdeps/s390/configure
+++ b/sysdeps/s390/configure
@@ -1,9 +1,6 @@
 # This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/s390.
 
-$as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_tbegin" >&5
 $as_echo_n "checking for __builtin_tbegin... " >&6; }
 if ${libc_cv_gcc_builtin_tbegin+:} false; then :

diff --git a/sysdeps/s390/configure.ac b/sysdeps/s390/configure.ac
index 14948c81eddf453c8c547ba16ec1978ab3ba43ee..daf1bc68233fcb076ac35f28e43014722f3d280a 100644 (file)
--- a/sysdeps/s390/configure.ac
+++ b/sysdeps/s390/configure.ac
@@ -1,10 +1,6 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/s390.
 
-dnl It is always possible to access static and hidden symbols in an
-dnl position independent way.
-AC_DEFINE(PI_STATIC_AND_HIDDEN)
-
 AC_CACHE_CHECK(for __builtin_tbegin, libc_cv_gcc_builtin_tbegin, [dnl
 cat > conftest.c <<\EOF
 #include <htmintrin.h>

diff --git a/sysdeps/sh/configure b/sysdeps/sh/configure
index 110eb65b06523755ae92789179d62ac656e7e6e1..3c05bb6b5eaa6a952ddc0446c617f436261f905a 100644 (file)
--- a/sysdeps/sh/configure
+++ b/sysdeps/sh/configure
@@ -1,5 +1,2 @@
 # This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/sh.
-
-$as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h
-

diff --git a/sysdeps/sh/configure.ac b/sysdeps/sh/configure.ac
index 21400c447dae551278714b8770e45faee757edaa..28d9e9a438309362e5f73ce734e58fd7cecd89b8 100644 (file)
--- a/sysdeps/sh/configure.ac
+++ b/sysdeps/sh/configure.ac
@@ -1,6 +1,2 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/sh.
-
-dnl It is always possible to access static and hidden symbols in an
-dnl position independent way.
-AC_DEFINE(PI_STATIC_AND_HIDDEN)

diff --git a/sysdeps/sparc/configure b/sysdeps/sparc/configure
index 491b00f0dcbeb84e09f558c50b2a0bc34bd97a74..70c084db5c59b70ccca91d55718ae5d0f6296a73 100644 (file)
--- a/sysdeps/sparc/configure
+++ b/sysdeps/sparc/configure
@@ -1,4 +1,2 @@
 # This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/sparc.
-
-$as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h

diff --git a/sysdeps/sparc/configure.ac b/sysdeps/sparc/configure.ac
index 5cdc0a984c498b23c88423eee0821094710bdafc..4fc6d6d7d144eb0a0acb56695f751505bb528518 100644 (file)
--- a/sysdeps/sparc/configure.ac
+++ b/sysdeps/sparc/configure.ac
@@ -1,4 +1,2 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/sparc.
-
-AC_DEFINE(PI_STATIC_AND_HIDDEN)

diff --git a/sysdeps/x86/configure b/sysdeps/x86/configure
index 46d436fddf60ea78d1544958f1c92213dbf8165f..a9c8c2ef672092629fceb0f7303fa7d86839aea2 100644 (file)
--- a/sysdeps/x86/configure
+++ b/sysdeps/x86/configure
@@ -190,8 +190,5 @@ fi
 config_vars="$config_vars
 enable-x86-isa-level = $libc_cv_include_x86_isa_level"
 
-$as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h
-
-
 $as_echo "#define SUPPORT_STATIC_PIE 1" >>confdefs.h
 

diff --git a/sysdeps/x86/configure.ac b/sysdeps/x86/configure.ac
index 918b636891a4138b7b22b0c6f3205b1b02670382..edd43a2551d3366a36ec2ae0aaeb510d595771c7 100644 (file)
--- a/sysdeps/x86/configure.ac
+++ b/sysdeps/x86/configure.ac
@@ -128,9 +128,5 @@ if test $libc_cv_include_x86_isa_level = yes; then
 fi
 LIBC_CONFIG_VAR([enable-x86-isa-level], [$libc_cv_include_x86_isa_level])
 
-dnl It is always possible to access static and hidden symbols in an
-dnl position independent way.
-AC_DEFINE(PI_STATIC_AND_HIDDEN)
-
 dnl Static PIE is supported.
 AC_DEFINE(SUPPORT_STATIC_PIE)