aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld/testsuite/ChangeLog2
-rw-r--r--ld/testsuite/ld-cris/libdso-13.d24
2 files changed, 15 insertions, 11 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index c73d4a0..6ca476a 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,5 +1,7 @@
2005-02-07 Hans-Peter Nilsson <hp@axis.com>
+ * ld-cris/libdso-13.d: Adjust for being identified as warning.
+
* ld-cris/globsymw2.s: New file.
* ld-cris/warn3.d, ld-cris/warn4.d: New tests.
diff --git a/ld/testsuite/ld-cris/libdso-13.d b/ld/testsuite/ld-cris/libdso-13.d
index d86dae9..b58f670 100644
--- a/ld/testsuite/ld-cris/libdso-13.d
+++ b/ld/testsuite/ld-cris/libdso-13.d
@@ -1,28 +1,30 @@
#source: dso-1.s
#source: dsov32-3.s
#as: --pic --no-underscore --march=v32
-#ld: --shared -m crislinux
+#ld: --shared -m crislinux -z nocombreloc
#readelf: -d -r
-#error: relocation R_CRIS_32_PCREL should not be used in a shared object; recompile with -fPIC
+#warning: relocation R_CRIS_32_PCREL should not be used in a shared object; recompile with -fPIC
-# FIXME: Have a textrel-enabling linker option. Split out the
-# expected readelf output into a separate test using that option.
# Check that a TEXTREL reloc is correctly generated for PCREL
-# relocations.
+# relocations against global symbols.
+# FIXME: Have a textrel-enabling(-disabling) linker option.
+# (Warning always generated unless [other option] warnings are
+# generally disabled.) Split out the expected readelf output
+# into a separate test using that option.
-Dynamic segment at offset 0x240 contains 10 entries:
+Dynamic section at offset 0x[0-9a-f][0-9a-f][0-9a-f] contains 10 entries:
Tag[ ]+Type[ ]+Name/Value
0x0+4 \(HASH\)[ ]+0x94
- 0x0+5 \(STRTAB\)[ ]+0x1e8
- 0x0+6 \(SYMTAB\)[ ]+0xe8
+ 0x0+5 \(STRTAB\)[ ]+0x[12][0-9a-f][0-9a-f]
+ 0x0+6 \(SYMTAB\)[ ]+0x[0-9a-f][0-9a-f]
0x0+a \(STRSZ\)[ ]+47 \(bytes\)
0x0+b \(SYMENT\)[ ]+16 \(bytes\)
- 0x0+7 \(RELA\)[ ]+0x218
+ 0x0+7 \(RELA\)[ ]+0x[12][0-9a-f][0-9a-f]
0x0+8 \(RELASZ\)[ ]+12 \(bytes\)
0x0+9 \(RELAENT\)[ ]+12 \(bytes\)
0x0+16 \(TEXTREL\)[ ]+0x0
0x0+ \(NULL\)[ ]+0x0
-Relocation section '\.rela\.text' at offset 0x218 contains 1 entries:
+Relocation section '\.rela\.text' at offset 0x[12][0-9a-f][0-9a-f] contains 1 entries:
Offset[ ]+Info[ ]+Type[ ]+Sym\.Value Sym\. Name \+ Addend
-0+22a 0+f06 R_CRIS_32_PCREL[ ]+0+224[ ]+dsofn \+ 6
+0+[12][0-9a-f][0-9a-f] 0+[0-9a-f]06 R_CRIS_32_PCREL[ ]+0+[0-f]+[ ]+dsofn \+ 6