diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makeconfig | 2 | ||||
| -rw-r--r-- | config.make.in | 1 | ||||
| -rwxr-xr-x | configure | 37 | ||||
| -rw-r--r-- | configure.ac | 24 |
5 files changed, 7 insertions, 63 deletions
diff --git a/ChangeLog b/ChangeLog index 38fa0cb1f9..6b787dc730 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2015-10-19 Joseph Myers <joseph@codesourcery.com> + * configure.ac (libc_cv_gnu89_inline): Remove configure test. + * configure: Regenerated. + * config.make.in (gnu89-inline-CFLAGS): Remove variable. + * Makeconfig (CFLAGS): Use -fgnu89-inline instead of + $(gnu89-inline-CFLAGS). + * configure.ac (libc_cv_asm_weak_directive): Remove configure test. (libc_cv_asm_weakext_directive): Likewise. diff --git a/Makeconfig b/Makeconfig index a03db7fff1..1dc522c7ed 100644 --- a/Makeconfig +++ b/Makeconfig @@ -884,7 +884,7 @@ CPPFLAGS = $(config-extra-cppflags) $(CPPUNDEFS) $(CPPFLAGS-config) \ $(foreach lib,$(libof-$(basename $(@F))) \ $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \ $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F))) -override CFLAGS = -std=gnu99 $(gnu89-inline-CFLAGS) $(config-extra-cflags) \ +override CFLAGS = -std=gnu99 -fgnu89-inline $(config-extra-cflags) \ $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \ $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \ $(CFLAGS-$(@F)) $(tls-model) \ diff --git a/config.make.in b/config.make.in index 44a874df26..7f561eb333 100644 --- a/config.make.in +++ b/config.make.in @@ -56,7 +56,6 @@ old-glibc-headers = @old_glibc_headers@ unwind-find-fde = @libc_cv_gcc_unwind_find_fde@ have-forced-unwind = @libc_cv_forced_unwind@ have-fpie = @libc_cv_fpie@ -gnu89-inline-CFLAGS = @gnu89_inline@ have-ssp = @libc_cv_ssp@ have-selinux = @have_selinux@ have-libaudit = @have_libaudit@ diff --git a/configure b/configure index 489ea00200..a97ed8cf2b 100755 --- a/configure +++ b/configure @@ -621,7 +621,6 @@ LIBGD libc_cv_cc_loop_to_function libc_cv_cc_submachine libc_cv_cc_nofma -gnu89_inline libc_cv_ssp fno_unit_at_a_time libc_cv_output_format @@ -6053,42 +6052,6 @@ fi $as_echo "$libc_cv_ssp" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fgnu89-inline" >&5 -$as_echo_n "checking for -fgnu89-inline... " >&6; } -if ${libc_cv_gnu89_inline+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat > conftest.c <<EOF -int foo; -#ifdef __GNUC_GNU_INLINE__ -main () { return 0;} -#else -#error -#endif -EOF -if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -S -std=gnu99 -fgnu89-inline - -o conftest.s conftest.c 1>&5' - { { 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_gnu89_inline=yes -else - libc_cv_gnu89_inline=no -fi -rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_gnu89_inline" >&5 -$as_echo "$libc_cv_gnu89_inline" >&6; } -if test $libc_cv_gnu89_inline = yes; then - gnu89_inline=-fgnu89-inline -else - gnu89_inline= -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc puts quotes around section names" >&5 $as_echo_n "checking whether cc puts quotes around section names... " >&6; } if ${libc_cv_have_section_quotes+:} false; then : diff --git a/configure.ac b/configure.ac index 14f5c170d9..63f5f92260 100644 --- a/configure.ac +++ b/configure.ac @@ -1505,30 +1505,6 @@ LIBC_TRY_CC_OPTION([$CFLAGS $CPPFLAGS -Werror -fstack-protector], ]) AC_SUBST(libc_cv_ssp) -AC_CACHE_CHECK(for -fgnu89-inline, libc_cv_gnu89_inline, [dnl -cat > conftest.c <<EOF -int foo; -#ifdef __GNUC_GNU_INLINE__ -main () { return 0;} -#else -#error -#endif -EOF -if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -S -std=gnu99 -fgnu89-inline - -o conftest.s conftest.c 1>&AS_MESSAGE_LOG_FD]) -then - libc_cv_gnu89_inline=yes -else - libc_cv_gnu89_inline=no -fi -rm -f conftest*]) -if test $libc_cv_gnu89_inline = yes; then - gnu89_inline=-fgnu89-inline -else - gnu89_inline= -fi -AC_SUBST(gnu89_inline) - AC_CACHE_CHECK(whether cc puts quotes around section names, libc_cv_have_section_quotes, [cat > conftest.c <<EOF |