From 2b64b5511a0d0814eb3938cff986edf493a7b362 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Fri, 11 Oct 2013 21:56:16 +0000
Subject: gold/ 	* configure.ac (MERGE_CONSTANTS_FLAG): New check. 	*
 configure: Regenerate. 	* Makefile.in: Regenerate. 	*
 testsuite/merge_string_literals_1.c: Renamed to have .cc suffix. 	*
 testsuite/merge_string_literals_2.c: Likewise. 	*
 testsuite/Makefile.am 	(merge_string_literals_1.o,
 merge_string_literals_2.o): Update deps. 	(AM_CFLAGS, AM_CXXFLAGS): Use
 $(MERGE_CONSTANTS_FLAG) in place of 	literal -fmerge-constants. 	*
 testsuite/Makefile.in: Regenerate.

---
 gold/Makefile.in | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gold/Makefile.in')

diff --git a/gold/Makefile.in b/gold/Makefile.in
index 09de14ca537..3bd9fae297d 100644
--- a/gold/Makefile.in
+++ b/gold/Makefile.in
@@ -319,6 +319,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MERGE_CONSTANTS_FLAG = @MERGE_CONSTANTS_FLAG@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-- 
cgit v1.2.1