diff --git a/ld/ChangeLog b/ld/ChangeLog index e8f56718d1..1bd90a27f0 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 aabf7816ae..568b3dc373 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 f161108d5c..7dae398c1b 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 1348d0c870..7a1aae8771 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 +