From 3944e22b463a62bfc4f6f0a892c6b0ac705e3c43 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 7 Apr 2017 00:18:33 +0930 Subject: [PATCH] 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. --- ld/ChangeLog | 6 ++++++ ld/testsuite/ld-elf/mbind1a.d | 8 -------- ld/testsuite/ld-elf/mbind1b.d | 8 -------- ld/testsuite/ld-elf/mbind1c.d | 8 -------- 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 + + * 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 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 + -- 2.7.4