diff options
| -rw-r--r-- | gold/ChangeLog | 5 | ||||
| -rwxr-xr-x | gold/configure | 4 | ||||
| -rw-r--r-- | gold/configure.ac | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index ccfae9e..1c81ee0 100644 --- 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 3ef8833..83f5aa9 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 c23117b..82ad11e 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], |