aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld/testsuite/ChangeLog8
-rw-r--r--ld/testsuite/ld-d10v/default_layout.d6
-rw-r--r--ld/testsuite/ld-discard/extern.d8
3 files changed, 18 insertions, 4 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 1e2eb93..38cad85 100644
--- 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 4984529..e70cf64 100644
--- 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 27c98c6..e5143cb 100644
--- 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".