* configure.ac: Fix check for -fmerge-constants.
	* configure.ac: Regenerate.
This commit is contained in:
Cary Coutant 2013-10-31 11:19:12 -07:00
parent 638aa5a1ba
commit 2500c0173e
3 changed files with 9 additions and 4 deletions

View file

@ -1,3 +1,8 @@
2013-10-31 Cary Coutant <ccoutant@google.com>
* configure.ac: Fix check for -fmerge-constants.
* configure.ac: Regenerate.
2013-10-30 Roland McGrath <mcgrathr@google.com> 2013-10-30 Roland McGrath <mcgrathr@google.com>
* x86_64.cc (Output_data_plt_x86_64_nacl::first_plt_entry): * x86_64.cc (Output_data_plt_x86_64_nacl::first_plt_entry):

4
gold/configure vendored
View file

@ -6353,9 +6353,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
const char *s = "foo"; const char *s = "foo";
_ACEOF _ACEOF
if ac_fn_c_try_compile "$LINENO"; then : if ac_fn_c_try_compile "$LINENO"; then :
have_merge_constants=yes gold_cv_merge_constants=yes
else else
have_merge_constants=no gold_cv_merge_constants=no
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$save_CFLAGS" CFLAGS="$save_CFLAGS"

View file

@ -343,8 +343,8 @@ AC_CACHE_CHECK([whether $CC supports -fmerge-constants],
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -fmerge-constants" CFLAGS="$CFLAGS -fmerge-constants"
AC_COMPILE_IFELSE([const char *s = "foo";], AC_COMPILE_IFELSE([const char *s = "foo";],
[have_merge_constants=yes], [gold_cv_merge_constants=yes],
[have_merge_constants=no]) [gold_cv_merge_constants=no])
CFLAGS="$save_CFLAGS"]) CFLAGS="$save_CFLAGS"])
AC_SUBST([MERGE_CONSTANTS_FLAG]) AC_SUBST([MERGE_CONSTANTS_FLAG])
AS_IF([test "$gold_cv_merge_constants" = yes], AS_IF([test "$gold_cv_merge_constants" = yes],