From 2500c0173e83309825d78f7a3335f0b3b2ecdae9 Mon Sep 17 00:00:00 2001 From: Cary Coutant Date: Thu, 31 Oct 2013 11:19:12 -0700 Subject: [PATCH] gold/ * configure.ac: Fix check for -fmerge-constants. * configure.ac: Regenerate. --- gold/ChangeLog | 5 +++++ gold/configure | 4 ++-- gold/configure.ac | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index ccfae9eb58e..1c81ee01288 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2013-10-31 Cary Coutant + + * configure.ac: Fix check for -fmerge-constants. + * configure.ac: Regenerate. + 2013-10-30 Roland McGrath * x86_64.cc (Output_data_plt_x86_64_nacl::first_plt_entry): diff --git a/gold/configure b/gold/configure index 3ef8833ff1a..83f5aa93082 100755 --- a/gold/configure +++ b/gold/configure @@ -6353,9 +6353,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext const char *s = "foo"; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - have_merge_constants=yes + gold_cv_merge_constants=yes else - have_merge_constants=no + gold_cv_merge_constants=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$save_CFLAGS" diff --git a/gold/configure.ac b/gold/configure.ac index c23117b6e75..82ad11ec625 100644 --- a/gold/configure.ac +++ b/gold/configure.ac @@ -343,8 +343,8 @@ AC_CACHE_CHECK([whether $CC supports -fmerge-constants], save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fmerge-constants" AC_COMPILE_IFELSE([const char *s = "foo";], - [have_merge_constants=yes], - [have_merge_constants=no]) + [gold_cv_merge_constants=yes], + [gold_cv_merge_constants=no]) CFLAGS="$save_CFLAGS"]) AC_SUBST([MERGE_CONSTANTS_FLAG]) AS_IF([test "$gold_cv_merge_constants" = yes], -- 2.30.2