gold/ChangeLog:

	* testsuite/incremental_test.sh: Rewrite.
	* testsuite/incremental_test_1.c: Rewrite.
	* testsuite/incremental_test_2.c: Rewrite.

diff --git a/elfcpp/ChangeLog b/elfcpp/ChangeLog
index 7488984e9ca83aacea0645f4985e2b0e26d5b018..e2de091830a9a56cd31431af8a500a92662dd7ec 100644 (file)
--- a/elfcpp/ChangeLog
+++ b/elfcpp/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-12  Cary Coutant  <ccoutant@google.com>
+
+       * elfcpp.h (enum SHT): Add SHT_GNU_INCREMENTAL_GOT_PLT.
+
 2010-08-12  Cary Coutant  <ccoutant@google.com>
 
        * elfcpp.h (enum SHT): Add SHT_GNU_INCREMENTAL_SYMTAB,

diff --git a/elfcpp/elfcpp.h b/elfcpp/elfcpp.h
index c46fbf5a47f1e2866a1514c09542c4fc2274f55e..b3eff64c48755dfb5c294e53f0981c6c0b232990 100644 (file)
--- a/elfcpp/elfcpp.h
+++ b/elfcpp/elfcpp.h
@@ -367,6 +367,7 @@ enum SHT
   SHT_GNU_INCREMENTAL_INPUTS = 0x6fff4700,
   SHT_GNU_INCREMENTAL_SYMTAB = 0x6fff4701,
   SHT_GNU_INCREMENTAL_RELOCS = 0x6fff4702,
+  SHT_GNU_INCREMENTAL_GOT_PLT = 0x6fff4703,
   // Object attributes.
   SHT_GNU_ATTRIBUTES = 0x6ffffff5,
   // GNU style dynamic hash table.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 47814f02511ce27d26613992a1854d794b32a9bb..72625019cbf5c3a341dfd5fcb8ac977f1ce13e15 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-12  Cary Coutant  <ccoutant@google.com>
+
+       * testsuite/incremental_test.sh: Rewrite.
+       * testsuite/incremental_test_1.c: Rewrite.
+       * testsuite/incremental_test_2.c: Rewrite.
+
 2010-08-12  Cary Coutant  <ccoutant@google.com>
 
        * arm.cc (Target_arm::got_size): Add const.

diff --git a/gold/testsuite/incremental_test.sh b/gold/testsuite/incremental_test.sh
index 8da60e0947b09b44a32af1d2d607ceb938bdb5ad..94369d4afbd8e0229801351b92322f9c6c797627 100755 (executable)
--- a/gold/testsuite/incremental_test.sh
+++ b/gold/testsuite/incremental_test.sh
@@ -2,8 +2,9 @@
 
 # incremental_test.sh -- test that incremental linking information is correct.
 
-# Copyright 2009 Free Software Foundation, Inc.
+# Copyright 2009, 2010 Free Software Foundation, Inc.
 # Written by Rafael Avila de Espindola <espindola@google.com>
+# and Cary Coutant <ccoutant@google.com>
 
 # This file is part of gold.
 
@@ -22,14 +23,66 @@
 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
 # MA 02110-1301, USA.
 
-set -e
-cat incremental_test.cmdline | grep "gcctestdir/ld " | cut -d ' ' -f 2- > \
-  actual
+check_cmp()
+{
+    if ! cmp -s "$1" "$2"
+    then
+       echo "Actual output differs from expected:"
+       echo "diff $1 $2"
+       diff $1 $2
+       exit 1
+    fi
+}
 
-cat incremental_test.stdout | grep "Link command line" | cut -d : -f 2- | \
-  cut -d ' ' -f 3- | sed "s/'//g" > recorded
+check()
+{
+    if ! grep -q "$2" "$1"
+    then
+       echo "Did not find expected output in $1:"
+       echo "   $2"
+       echo ""
+       echo "Actual output below:"
+       cat "$1"
+       exit 1
+    fi
+}
 
-diff actual recorded
-rm actual recorded
+# Extract actual command line from linker's -v output.
+cat incremental_test.cmdline |
+  grep "gcctestdir/ld " |
+  cut -d ' ' -f 2- > actual
 
-exit 0
\ No newline at end of file
+# Extract recorded command line from dump of the output file.
+cat incremental_test.stdout |
+  grep "Link command line" |
+  cut -d : -f 2- |
+  cut -d ' ' -f 3- |
+  sed "s/'//g" > recorded
+
+# Verify that the command line was recorded correctly.
+check_cmp actual recorded
+
+rm -f actual recorded
+
+# Filter the incremental-dump output into a format that can be grepped
+# more easily.
+
+awk '
+    /^[A-Za-z][A-Za-z ]+:$/ { section = $0; }
+    /^[[]/ { subsection = $0; }
+    /^ / { print section, subsection, $0; }
+' < incremental_test.stdout > incremental_test.dump
+
+check incremental_test.dump "Input sections: .* incremental_test_1.o  *1 "
+check incremental_test.dump "Input sections: .* incremental_test_2.o  *1 "
+check incremental_test.dump "Global symbol table: .* main  .* relocation type "
+check incremental_test.dump "Global symbol table: .* a  *incremental_test_1.o "
+check incremental_test.dump "Global symbol table: .* a .* relocation type "
+check incremental_test.dump "Global symbol table: .* b  *incremental_test_2.o "
+check incremental_test.dump "Global symbol table: .* b .* relocation type "
+check incremental_test.dump "Global symbol table: .* t1  *incremental_test_2.o "
+check incremental_test.dump "Global symbol table: .* t1 .* relocation type "
+
+rm -f incremental_test.dump
+
+exit 0

diff --git a/gold/testsuite/incremental_test_1.c b/gold/testsuite/incremental_test_1.c
index 97835151e6a328e9f70f239f3a7328307b6f2766..58faa0e110645871545cbfab3f1c41bfe9f363c1 100644 (file)
--- a/gold/testsuite/incremental_test_1.c
+++ b/gold/testsuite/incremental_test_1.c
@@ -18,4 +18,9 @@
 // Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
 // MA 02110-1301, USA.
 
-int a;
+int a = -1;
+
+int t1(int b)
+{
+  return a + b;
+}

diff --git a/gold/testsuite/incremental_test_2.c b/gold/testsuite/incremental_test_2.c
index 050986e73c620f59d0ce92138cb847c729b62b90..7fcecc426924d6db66963c9dda1213c38a3a042b 100644 (file)
--- a/gold/testsuite/incremental_test_2.c
+++ b/gold/testsuite/incremental_test_2.c
@@ -18,8 +18,12 @@
 // Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
 // MA 02110-1301, USA.
 
-int b;
+int b = 1;
+
+extern int t1(int);
 
 int main(void) {
+  if (t1(b) != 0)
+    return 1;
   return 0;
 }