ld-d10v/default_layout.d: Adjust expected offsets to allow for section alignment.

ld-discard/extern.d: Adjust expected warning to take into account the fact that
the linker's name might be included and that the reloc might have been adjusted
to be against the section symbol.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 1e2eb93783ac765b5b4b821b0d1da15043f2b789..38cad85a259d994c3e1ec2c6480d31691df0f9c5 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,5 +1,13 @@
 2005-03-01  Nick Clifton  <nickc@redhat.com>
 
+       * ld-d10v/default_layout.d: Adjust expected offsets to allow for
+       section alignment.
+       
+       * ld-discard/extern.d: Adjust expected warning to take into
+       account the fact that the linker's name might be included and that
+       the reloc might have been adjusted to be against the section
+       symbol.
+
        * ld-cris/warn3.d: Only run this version of the test for cris-aout
        targets.
        * ld-cris/warn4.d: Only run this version of the test for cris-elf

diff --git a/ld/testsuite/ld-d10v/default_layout.d b/ld/testsuite/ld-d10v/default_layout.d
index 498452996c138a9f46efabc03299ba85ff5b445d..e70cf64ef902db2ff90e272c755c7fda0e140220 100644 (file)
--- a/ld/testsuite/ld-d10v/default_layout.d
+++ b/ld/testsuite/ld-d10v/default_layout.d
@@ -8,9 +8,9 @@ Sections:
 Idx Name          Size      VMA       LMA       File off  Algn
   0 \.text         00000004  01014000  01014000  00001000  2\*\*0
                   CONTENTS, ALLOC, LOAD, READONLY, CODE
-  1 \.data         00000000  02000004  02000004  00001004  2\*\*0
+  1 \.data         00000000  02000000  02000000  00002000  2\*\*0
                   CONTENTS, ALLOC, LOAD, DATA
-  2 \.bss          00000000  02000004  02000004  00001004  2\*\*0
+  2 \.bss          00000000  02000000  02000000  00002000  2\*\*0
                   ALLOC
-  3 .stack        00000000  0200bffe  0200bffe  00001004  2\*\*0
+  3 .stack        00000000  0200bffc  0200bffc  00002000  2\*\*0
                   CONTENTS

diff --git a/ld/testsuite/ld-discard/extern.d b/ld/testsuite/ld-discard/extern.d
index 27c98c6ab894755f70e40fb4323b369589d57233..e5143cb94c711f3e35a086442b62ec6d85275c56 100644 (file)
--- a/ld/testsuite/ld-discard/extern.d
+++ b/ld/testsuite/ld-discard/extern.d
@@ -1,5 +1,11 @@
 #source: extern.s
 #ld: -T discard.ld
-#warning: `data' referenced in section `\.text' of tmpdir/dump0.o: defined in discarded section `\.data\.exit' of tmpdir/dump0.o
+#warning: .*data.* referenced in section `\.text' of tmpdir/dump0.o: defined in discarded section `\.data\.exit' of tmpdir/dump0.o
 #objdump: -p
 #pass
+# The expected warning used to start with "`data' referenced..." but
+# this has two problems: 1) It does not include the name of the linker
+# command which will be present in the message, eg "../ld-new"
+# 2) Targets which define EXTERN_FORCE_RELOC to 0 in their
+# gas/config/tc-xxx.h file will convert the symbol in the reloc from
+# "data" to the section symbol ".data.exit".