diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/i386/configure | 22 | ||||
| -rw-r--r-- | sysdeps/i386/configure.ac | 8 | ||||
| -rw-r--r-- | sysdeps/i386/i686/Makefile | 2 |
4 files changed, 6 insertions, 32 deletions
diff --git a/ChangeLog b/ChangeLog index cb49047fae..77878ded96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2015-10-15 Joseph Myers <joseph@codesourcery.com> + * sysdeps/i386/configure.ac (libc_cv_as_i686): Remove configure + test. + * sysdeps/i386/configure: Regenerated. + * sysdeps/i386/i686/Makefile [$(config-asflags-i686) = yes]: Make + code unconditional. + * configure.ac (libc_cv_asm_previous_directive): Remove configure test. (libc_cv_asm_popsection_directive): Likewise. diff --git a/sysdeps/i386/configure b/sysdeps/i386/configure index 0abafe3de8..1fc13aba6b 100644 --- a/sysdeps/i386/configure +++ b/sysdeps/i386/configure @@ -92,28 +92,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler -mtune=i686 support" >&5 -$as_echo_n "checking for assembler -mtune=i686 support... " >&6; } -if ${libc_cv_as_i686+:} false; then : - $as_echo_n "(cached) " >&6 -else - if { ac_try='${CC-cc} -Wa,-mtune=i686 -xc /dev/null -S -o /dev/null' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - libc_cv_as_i686=yes -else - libc_cv_as_i686=no -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_as_i686" >&5 -$as_echo "$libc_cv_as_i686" >&6; } -config_vars="$config_vars -config-asflags-i686 = $libc_cv_as_i686" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Intel MPX support" >&5 $as_echo_n "checking for Intel MPX support... " >&6; } if ${libc_cv_asm_mpx+:} false; then : diff --git a/sysdeps/i386/configure.ac b/sysdeps/i386/configure.ac index 21b1c8f218..7f2e4ccd01 100644 --- a/sysdeps/i386/configure.ac +++ b/sysdeps/i386/configure.ac @@ -34,14 +34,6 @@ AC_CHECK_HEADER([cpuid.h], , [AC_MSG_ERROR([gcc must provide the <cpuid.h> header])], [/* No default includes. */]) -dnl Check if -Wa,-mtune=i686 works. -AC_CACHE_CHECK(for assembler -mtune=i686 support, libc_cv_as_i686, [dnl -LIBC_TRY_CC_OPTION([-Wa,-mtune=i686], - [libc_cv_as_i686=yes], - [libc_cv_as_i686=no]) -]) -LIBC_CONFIG_VAR([config-asflags-i686], [$libc_cv_as_i686]) - dnl Check whether asm supports Intel MPX AC_CACHE_CHECK(for Intel MPX support, libc_cv_asm_mpx, [dnl cat > conftest.s <<\EOF diff --git a/sysdeps/i386/i686/Makefile b/sysdeps/i386/i686/Makefile index bafe5f7d61..e3a3201c4b 100644 --- a/sysdeps/i386/i686/Makefile +++ b/sysdeps/i386/i686/Makefile @@ -1,7 +1,6 @@ # So that we can test __m128's alignment stack-align-test-flags += -msse -ifeq (yes,$(config-asflags-i686)) CFLAGS-.o += -Wa,-mtune=i686 CFLAGS-.os += -Wa,-mtune=i686 CFLAGS-.op += -Wa,-mtune=i686 @@ -13,4 +12,3 @@ ASFLAGS-.os += -Wa,-mtune=i686 ASFLAGS-.op += -Wa,-mtune=i686 ASFLAGS-.og += -Wa,-mtune=i686 ASFLAGS-.oS += -Wa,-mtune=i686 -endif |