[PATCH] gold testsuite: conditionalize -fmerge-constants use, clean up test

[Cary Coutant]

>> You've got two different spellings here: MERGE_CONSTANTS_FLAGS and
>> MERGE_CONSTANTS_CFLAGS. How about just "MERGE_CONSTANTS_FLAG"?
>
> Oops.  The former was a typo, I was going for consistency with other
> *_CFLAGS variables.  But _FLAG is fine by me.
>
>> OK with that change.
>
> Done and committed.

Sorry, I missed another case where you had two different spellings.
I've committed the following patch.

-cary


2013-10-31  Cary Coutant  <ccoutant@google.com>

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

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],