diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | sysdeps/i386/configure | 3 | ||||
| -rw-r--r-- | sysdeps/i386/configure.ac | 2 |
5 files changed, 10 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index e1be998da4..2727f7fe6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2014-06-25 Joseph Myers <joseph@codesourcery.com> + * configure.ac (USE_REGPARMS): Don't define here. + * configure: Regenerated. + * sysdeps/i386/configure.ac (USE_REGPARMS): Define here. + * sysdeps/i386/configure: Regenerated. + * nptl/createthread.c: Don't include kernel-features.h. * nptl/pthread_cancel.c: Likewise. * nptl/pthread_condattr_setclock.c: Likewise. diff --git a/configure b/configure index 34bcd53bbf..ac5a67cf9d 100755 --- a/configure +++ b/configure @@ -3969,11 +3969,6 @@ fi test -n "$base_machine" || base_machine=$machine -if test "$base_machine" = "i386"; then - $as_echo "#define USE_REGPARMS 1" >>confdefs.h - -fi - # For the multi-arch option we need support in the assembler & linker. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler and linker STT_GNU_IFUNC support" >&5 $as_echo_n "checking for assembler and linker STT_GNU_IFUNC support... " >&6; } diff --git a/configure.ac b/configure.ac index 589b3d053c..bd3e829666 100644 --- a/configure.ac +++ b/configure.ac @@ -586,10 +586,6 @@ fi test -n "$base_machine" || base_machine=$machine AC_SUBST(base_machine) -if test "$base_machine" = "i386"; then - AC_DEFINE(USE_REGPARMS) -fi - # For the multi-arch option we need support in the assembler & linker. AC_CACHE_CHECK([for assembler and linker STT_GNU_IFUNC support], libc_cv_ld_gnu_indirect_function, [dnl diff --git a/sysdeps/i386/configure b/sysdeps/i386/configure index 5dcc159900..f0a20e3d3b 100644 --- a/sysdeps/i386/configure +++ b/sysdeps/i386/configure @@ -240,5 +240,8 @@ $as_echo "$libc_cv_cc_novzeroupper" >&6; } config_vars="$config_vars config-cflags-novzeroupper = $libc_cv_cc_novzeroupper" +$as_echo "#define USE_REGPARMS 1" >>confdefs.h + + $as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h diff --git a/sysdeps/i386/configure.ac b/sysdeps/i386/configure.ac index 96ab7b0f5a..dfe0b47343 100644 --- a/sysdeps/i386/configure.ac +++ b/sysdeps/i386/configure.ac @@ -88,6 +88,8 @@ LIBC_TRY_CC_OPTION([-mno-vzeroupper], ]) LIBC_CONFIG_VAR([config-cflags-novzeroupper], [$libc_cv_cc_novzeroupper]) +AC_DEFINE(USE_REGPARMS) + dnl It is always possible to access static and hidden symbols in an dnl position independent way. AC_DEFINE(PI_STATIC_AND_HIDDEN) |