* testsuite/Makefile.am: Add -ffunction-sections to compile

	gc_comdat_test files.  Add -Wl,--gc-sections to build
	gc_comdat_test.
	* testsuite/Makefile.in: Regenerate.
	* testsuite/gc_comdat_test.sh: Fix the condition around grep.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index a56d2e9d0c8fc08bf5883ab91456ce34421fc159..9e092e24afeb803af4a6c006098a7c4b17427ee0 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-22  Sriraman Tallam  <tmsriram@google.com>
+
+       * testsuite/Makefile.am: Add -ffunction-sections to compile 
+       gc_comdat_test files.  Add -Wl,--gc-sections to build
+       gc_comdat_test.
+       * testsuite/Makefile.in: Regenerate.
+       * testsuite/gc_comdat_test.sh: Fix the condition around grep.
+
 2009-05-21  Sriraman Tallam  <tmsriram@google.com>
 
        * object.cc (Sized_relobj::map_to_kept_section): Return NULL if the

diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
index 766807353e6dfa8b4988bd2cb0537a05a4ce5981..aeee0a67b9347d439022426fb8ca34eff2f8dc92 100644 (file)
--- a/gold/testsuite/Makefile.am
+++ b/gold/testsuite/Makefile.am
@@ -107,11 +107,11 @@ flagstest_ndebug.o: constructor_test.cc
 check_SCRIPTS += gc_comdat_test.sh
 check_DATA += gc_comdat_test.stdout
 gc_comdat_test_1.o: gc_comdat_test_1.cc 
-       $(CXXCOMPILE) -O0 -c -g -o $@ $<
+       $(CXXCOMPILE) -O0 -c -ffunction-sections -g -o $@ $<
 gc_comdat_test_2.o: gc_comdat_test_2.cc 
-       $(CXXCOMPILE) -O0 -c -g -o $@ $<
+       $(CXXCOMPILE) -O0 -c -ffunction-sections -g -o $@ $<
 gc_comdat_test: gc_comdat_test_1.o gc_comdat_test_2.o gcctestdir/ld
-       $(CXXLINK) -Bgcctestdir/ --gc-sections gc_comdat_test_1.o gc_comdat_test_2.o
+       $(CXXLINK) -Bgcctestdir/ -Wl,--gc-sections gc_comdat_test_1.o gc_comdat_test_2.o
 gc_comdat_test.stdout: gc_comdat_test
        $(TEST_NM) -C gc_comdat_test > gc_comdat_test.stdout
 

diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in
index 77ebf90adcde104a4570e86c79bfa41493262a5f..c4ad51b120c00e57e7a609d9b6d9d3502e4d8071 100644 (file)
--- a/gold/testsuite/Makefile.in
+++ b/gold/testsuite/Makefile.in
@@ -2226,11 +2226,11 @@ uninstall-am: uninstall-info-am
 @GCC_TRUE@@NATIVE_LINKER_TRUE@flagstest_ndebug.o: constructor_test.cc
 @GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -O0 -c -o $@ $<
 @GCC_TRUE@@NATIVE_LINKER_TRUE@gc_comdat_test_1.o: gc_comdat_test_1.cc 
-@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -O0 -c -g -o $@ $<
+@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -O0 -c -ffunction-sections -g -o $@ $<
 @GCC_TRUE@@NATIVE_LINKER_TRUE@gc_comdat_test_2.o: gc_comdat_test_2.cc 
-@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -O0 -c -g -o $@ $<
+@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -O0 -c -ffunction-sections -g -o $@ $<
 @GCC_TRUE@@NATIVE_LINKER_TRUE@gc_comdat_test: gc_comdat_test_1.o gc_comdat_test_2.o gcctestdir/ld
-@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXLINK) -Bgcctestdir/ --gc-sections gc_comdat_test_1.o gc_comdat_test_2.o
+@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXLINK) -Bgcctestdir/ -Wl,--gc-sections gc_comdat_test_1.o gc_comdat_test_2.o
 @GCC_TRUE@@NATIVE_LINKER_TRUE@gc_comdat_test.stdout: gc_comdat_test
 @GCC_TRUE@@NATIVE_LINKER_TRUE@ $(TEST_NM) -C gc_comdat_test > gc_comdat_test.stdout
 @GCC_TRUE@@NATIVE_LINKER_TRUE@basic_test.o: basic_test.cc

diff --git a/gold/testsuite/gc_comdat_test.sh b/gold/testsuite/gc_comdat_test.sh
index 875d6d73879db6b7529e9b7781d601f9dbae9907..baff98d0205bc9d6941caa3956b80c5fbc009d73 100755 (executable)
--- a/gold/testsuite/gc_comdat_test.sh
+++ b/gold/testsuite/gc_comdat_test.sh
@@ -29,7 +29,7 @@
 
 check()
 {
-    if ! grep -q "$2" "$1"
+    if grep -q "$2" "$1"
     then
         echo "Garbage collection failed to collect :"
         echo "   $2"