gold/

	* configure.ac: Fix check for -fmerge-constants.
	* configure.ac: Regenerate.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index ccfae9eb58e408329d0535e678e60e486db11868..1c81ee0128809a9dfd9399f7c728bc1b3706b1c3 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -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>
 
        * x86_64.cc (Output_data_plt_x86_64_nacl::first_plt_entry):

diff --git a/gold/configure b/gold/configure
index 3ef8833ff1ab68e1d6463bf557e2b33a1689cd65..83f5aa93082aab9e7d5dbd8cf75224d08355897a 100755 (executable)
--- 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 c23117b6e75663ec741d045891759c551ff7ba1d..82ad11ec62520a1765aca91f9b1a901fe5b9cd2c 100644 (file)
--- 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],