aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2017-04-07 00:18:33 +0930
committerAlan Modra <amodra@gmail.com>2017-04-07 00:18:33 +0930
commit3944e22b463a62bfc4f6f0a892c6b0ac705e3c43 (patch)
treefc3f5fa48d5f0af0fdc63ba070dae1f486171509 /ld
parent86abf93a3a56ccdf1c5f15b841ee9d6a0516a2cf (diff)
downloadfsf-binutils-gdb-3944e22b463a62bfc4f6f0a892c6b0ac705e3c43.zip
fsf-binutils-gdb-3944e22b463a62bfc4f6f0a892c6b0ac705e3c43.tar.gz
fsf-binutils-gdb-3944e22b463a62bfc4f6f0a892c6b0ac705e3c43.tar.bz2
mbind tests: don't check PT_LOAD headers
On powerpc-linux, the second PT_LOAD header is RWE. On hppa64-linux, only one PT_LOAD header is present. Since the tests are really about the new GNU_MBIND headers, ignore PT_LOAD and its section mapping. * testsuite/ld-elf/mbind1a.d: Remove matches for PT_LOAD segments. * testsuite/ld-elf/mbind1b.d: Likewise. * testsuite/ld-elf/mbind1c.d: Likewise.
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog6
-rw-r--r--ld/testsuite/ld-elf/mbind1a.d8
-rw-r--r--ld/testsuite/ld-elf/mbind1b.d8
-rw-r--r--ld/testsuite/ld-elf/mbind1c.d8
4 files changed, 6 insertions, 24 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index e8f5671..1bd90a2 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2017-04-07 Alan Modra <amodra@gmail.com>
+
+ * testsuite/ld-elf/mbind1a.d: Remove matches for PT_LOAD segments.
+ * testsuite/ld-elf/mbind1b.d: Likewise.
+ * testsuite/ld-elf/mbind1c.d: Likewise.
+
2017-04-05 Hans-Peter Nilsson <hp@axis.com>
PR ld/21233
diff --git a/ld/testsuite/ld-elf/mbind1a.d b/ld/testsuite/ld-elf/mbind1a.d
index aabf781..568b3dc 100644
--- a/ld/testsuite/ld-elf/mbind1a.d
+++ b/ld/testsuite/ld-elf/mbind1a.d
@@ -15,10 +15,6 @@
\[[ 0-9]+\] \.mbind\.bss[ ]+NOBITS[ ]+[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 WAD 0 3 4096
#...
Program Headers:
- Type.*
-#...
- LOAD[ \t]+0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x200000
- LOAD[ \t]+0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW 0x200000
#...
GNU_MBIND\+0[ \t]+0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x1000
GNU_MBIND\+0x3[ \t]+0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x1000
@@ -29,10 +25,6 @@ Program Headers:
GNU_MBIND\+0x3[ \t]+0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW 0x1000
#...
Section to Segment mapping:
- Segment Sections...
-#...
- [0-9]+ .*.text .mbind.text .mbind.text .mbind.rodata .*
- [0-9]+ .*.mbind.data .mbind.data.* .mbind.bss .mbind.bss .*
#...
[0-9]+ .mbind.text +
[0-9]+ .mbind.text +
diff --git a/ld/testsuite/ld-elf/mbind1b.d b/ld/testsuite/ld-elf/mbind1b.d
index f161108..7dae398 100644
--- a/ld/testsuite/ld-elf/mbind1b.d
+++ b/ld/testsuite/ld-elf/mbind1b.d
@@ -15,10 +15,6 @@
\[[ 0-9]+\] \.mbind\.bss[ ]+NOBITS[ ]+[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 WAD 0 3 4096
#...
Program Headers:
- Type.*
-#...
- LOAD[ \t]+0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x200000
- LOAD[ \t]+0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW 0x200000
#...
GNU_MBIND\+0[ \t]+0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x1000
GNU_MBIND\+0x3[ \t]+0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x1000
@@ -29,10 +25,6 @@ Program Headers:
GNU_MBIND\+0x3[ \t]+0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW 0x1000
#...
Section to Segment mapping:
- Segment Sections...
-#...
- [0-9]+ .*.text .mbind.text .mbind.text .mbind.rodata .*
- [0-9]+ .*.mbind.data .mbind.data.* .mbind.bss .mbind.bss .*
#...
[0-9]+ .mbind.text +
[0-9]+ .mbind.text +
diff --git a/ld/testsuite/ld-elf/mbind1c.d b/ld/testsuite/ld-elf/mbind1c.d
index 1348d0c..7a1aae8 100644
--- a/ld/testsuite/ld-elf/mbind1c.d
+++ b/ld/testsuite/ld-elf/mbind1c.d
@@ -15,10 +15,6 @@
\[[ 0-9]+\] \.mbind\.bss[ ]+NOBITS[ ]+[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 WAD 0 3 4096
#...
Program Headers:
- Type.*
-#...
- LOAD[ \t]+0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x200000
- LOAD[ \t]+0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW 0x200000
#...
GNU_MBIND\+0[ \t]+0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x1000
GNU_MBIND\+0x3[ \t]+0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x1000
@@ -29,10 +25,6 @@ Program Headers:
GNU_MBIND\+0x3[ \t]+0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW 0x1000
#...
Section to Segment mapping:
- Segment Sections...
-#...
- [0-9]+ .*.text .mbind.text .mbind.text .mbind.rodata .*
- [0-9]+ .*.mbind.data .mbind.data.* .mbind.bss .mbind.bss .*
#...
[0-9]+ .mbind.text +
[0-9]+ .mbind.text +