x86/configure.ac: Define PI_STATIC_AND_HIDDEN/SUPPORT_STATIC_PIE

Move PI_STATIC_AND_HIDDEN and SUPPORT_STATIC_PIE to
sysdeps/x86/configure.ac.

diff --git a/sysdeps/i386/configure b/sysdeps/i386/configure
index ed46d533148e64c890e8f7bf1489013207c223c7..af50c5bfabfcb159d635738446e1aabfb90ec25d 100644 (file)
--- a/sysdeps/i386/configure
+++ b/sysdeps/i386/configure
@@ -83,13 +83,7 @@ $as_echo "$libc_cv_ld_static_pie" >&6; }
   fi
 fi
 
-$as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h
-
-
 if test x"$multi_arch" != xno; then
   $as_echo "#define NO_HIDDEN_EXTERN_FUNC_IN_PIE 1" >>confdefs.h
 
 fi
-
-$as_echo "#define SUPPORT_STATIC_PIE 1" >>confdefs.h
-

diff --git a/sysdeps/i386/configure.ac b/sysdeps/i386/configure.ac
index a6a06728351e7f6474fc5ea0c7e268360ef8deb5..234ef2454aac6d736d8967b77a7487bd44af82bb 100644 (file)
--- a/sysdeps/i386/configure.ac
+++ b/sysdeps/i386/configure.ac
@@ -53,15 +53,8 @@ rm -f conftest*])
   fi
 fi
 
-dnl It is always possible to access static and hidden symbols in an
-dnl position independent way.
-AC_DEFINE(PI_STATIC_AND_HIDDEN)
-
 dnl When multi-arch is enabled, all external functions must be called
 dnl via PIC PLT in PIE, which requires setting up EBX register.
 if test x"$multi_arch" != xno; then
   AC_DEFINE(NO_HIDDEN_EXTERN_FUNC_IN_PIE)
 fi
-
-dnl Static PIE is supported.
-AC_DEFINE(SUPPORT_STATIC_PIE)

diff --git a/sysdeps/x86/configure b/sysdeps/x86/configure
index 7bdbfdc6dc2ad38f8d07388ad0514dae1ffdb5aa..46d436fddf60ea78d1544958f1c92213dbf8165f 100644 (file)
--- a/sysdeps/x86/configure
+++ b/sysdeps/x86/configure
@@ -189,3 +189,9 @@ $as_echo "$libc_cv_have_x86_movbe" >&6; }
 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 10d5c2e0e555fc795e7e02d8f042e261b31d8500..918b636891a4138b7b22b0c6f3205b1b02670382 100644 (file)
--- a/sysdeps/x86/configure.ac
+++ b/sysdeps/x86/configure.ac
@@ -127,3 +127,10 @@ if test $libc_cv_include_x86_isa_level = yes; then
   fi
 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)

diff --git a/sysdeps/x86_64/configure b/sysdeps/x86_64/configure
index d4dd0aa7df4b804ce6755816a9dae38eea3012e7..44b6055e554b54becab9f858726d0fb250ae8324 100755 (executable)
--- a/sysdeps/x86_64/configure
+++ b/sysdeps/x86_64/configure
@@ -27,11 +27,5 @@ if test x"$build_mathvec" = xnotset; then
   build_mathvec=yes
 fi
 
-$as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h
-
-
-$as_echo "#define SUPPORT_STATIC_PIE 1" >>confdefs.h
-
-
 test -n "$critic_missing" && as_fn_error $? "
 *** $critic_missing" "$LINENO" 5

diff --git a/sysdeps/x86_64/configure.ac b/sysdeps/x86_64/configure.ac
index c4c748c1d042b1db01fabae699629f59e39a2145..1215dcb1e40d4af8c094315646d363fc10e49fe6 100644 (file)
--- a/sysdeps/x86_64/configure.ac
+++ b/sysdeps/x86_64/configure.ac
@@ -14,12 +14,5 @@ if test x"$build_mathvec" = xnotset; then
   build_mathvec=yes
 fi
 
-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)
-
 test -n "$critic_missing" && AC_MSG_ERROR([
 *** $critic_missing])