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.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index e8f56718d1eef2196f02757db44c861de07a8d6c..1bd90a27f03b5a6741ca8c8e2bee7a9776ad89fe 100644 (file)
--- 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 aabf7816ae00701e9829642f693d91f7d31e5a17..568b3dc3730174b23faf7857b80d3897b23bec09 100644 (file)
--- 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 f161108d5c62620d1e83b81c36106436f2ad310c..7dae398c1bc9dcb197594faaee13adabe2919c3d 100644 (file)
--- 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 1348d0c87074b2f1463e94be3a3aebb913c36ab2..7a1aae877161afbb214c01256ef65e3787b29d79 100644 (file)
--- 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 +