2010-04-23 Sriraman Tallam <tmsriram@google.com>

	* gc.h (gc_process_relocs): Pass information on relocs pointing to
	sections that are not ordinary to icf.
	* icf.cc (get_section_contents): Handle relocation pointing to section
	with no object or shndx information.
	* testsuite/Makefile.am: Remove icf_virtual_function_folding_test.sh
	* testsuite/Makefile.in: Regenerate.
	* testsuite/icf_virtual_function_folding_test.cc: Remove printf.
	* testsuite/icf_virtual_function_folding_test.sh: Delete file.

4 files changed, 0 insertions, 41 deletions

diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
index 7c48074..e77a3ed 100644
--- a/gold/testsuite/Makefile.am
+++ b/gold/testsuite/Makefile.am
@@ -193,7 +193,6 @@ icf_safe_so_test_1.stdout: icf_safe_so_test
 icf_safe_so_test_2.stdout: icf_safe_so_test
 	$(TEST_READELF) -h icf_safe_so_test > icf_safe_so_test_2.stdout
 
-check_SCRIPTS += icf_virtual_function_folding_test.sh
 check_PROGRAMS += icf_virtual_function_folding_test
 MOSTLYCLEANFILES += icf_virtual_function_folding_test
 icf_virtual_function_folding_test.o: icf_virtual_function_folding_test.cc
diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in
index 6c8860d..7b51717 100644
--- a/gold/testsuite/Makefile.in
+++ b/gold/testsuite/Makefile.in
@@ -62,7 +62,6 @@ check_PROGRAMS = object_unittest$(EXEEXT) binary_unittest$(EXEEXT) \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	icf_keep_unique_test.sh \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	icf_safe_test.sh \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	icf_safe_so_test.sh \
-@GCC_TRUE@@NATIVE_LINKER_TRUE@	icf_virtual_function_folding_test.sh \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	icf_preemptible_functions_test.sh \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	icf_string_merge_test.sh \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	two_file_shared.sh weak_plt.sh \
diff --git a/gold/testsuite/icf_virtual_function_folding_test.cc b/gold/testsuite/icf_virtual_function_folding_test.cc
index 80f96ef..1ba3e73 100644
--- a/gold/testsuite/icf_virtual_function_folding_test.cc
+++ b/gold/testsuite/icf_virtual_function_folding_test.cc
@@ -25,11 +25,8 @@
 // for the virtual call fn1 entry in the vtable.  This test makes sure
 // the call to Foo::fn1 works correctly after the folding.
 
-#include <stdio.h>
-
 int fn2(void *)
 {
-  printf("fn1==fn2\n");
   return 0xA;
 }
 
@@ -54,7 +51,6 @@ class Foo : public Bar
 
 int Foo::fn1()
 {
-  printf("fn1==fn2\n");
   return 0xA;
 }
 
diff --git a/gold/testsuite/icf_virtual_function_folding_test.sh b/gold/testsuite/icf_virtual_function_folding_test.sh
deleted file mode 100755
index 31c8339..0000000
--- a/gold/testsuite/icf_virtual_function_folding_test.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-# icf_virtual_function_folding_test.sh -- test --icf
-
-# Copyright 2010 Free Software Foundation, Inc.
-# Written by Sriraman Tallam <tmsriram@google.com>.
-
-# This file is part of gold.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-check()
-{
-    ./icf_virtual_function_folding_test | grep $1 > /dev/null 2>&1
-    if [ $? -gt 0 ]
-    then
-        echo "Program output incorrect after folding." $2
-	exit 1
-    fi
-}
-
-check "fn1==fn2"