[binutils-gdb] Update section merge test.

[Nick Clifton <nickc at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=924bc11ba455cfe5e44afa3cb24e4dbe24536734

commit 924bc11ba455cfe5e44afa3cb24e4dbe24536734
Author: Pitchumani Sivanupandi <pitchumani.s@atmel.com>
Date:   Mon May 9 12:04:16 2016 +0100

    Update section merge test.
    
    	* testsuite/ld-elf/flags1.d (readelf): Dump section header instead
    	program headers.
    	(xfail): Remove avr-*-*.
    	Update regex to check the section flags.
    	* testsuite/ld-elf/merge.d (xfail): Remove avr-*-*.

Diff:
---
 ld/ChangeLog                 |  8 ++++++++
 ld/testsuite/ld-elf/flags1.d | 15 ++++++---------
 ld/testsuite/ld-elf/merge.d  |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index ea43adb..2e07395 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+2016-05-09  Pitchumani Sivanupandi  <pitchumani.s@atmel.com>
+
+	* testsuite/ld-elf/flags1.d (readelf): Dump section header instead
+	program headers.
+	(xfail): Remove avr-*-*.
+	Update regex to check the section flags.
+	* testsuite/ld-elf/merge.d (xfail): Remove avr-*-*.
+
 2016-05-09  Alan Modra  <amodra@gmail.com>
 
 	* Makefile.am (ealphavms.c, eelf64_ia64_vms): Correct .em deps.
diff --git a/ld/testsuite/ld-elf/flags1.d b/ld/testsuite/ld-elf/flags1.d
index e7c6b4f..09ac477 100644
--- a/ld/testsuite/ld-elf/flags1.d
+++ b/ld/testsuite/ld-elf/flags1.d
@@ -1,11 +1,11 @@
 #name: --set-section-flags test 1 (sections)
 #ld: -Tflags1.ld
 #objcopy_linked_file: --set-section-flags .post_text_reserve=contents,alloc,load,readonly,code
-#readelf: -l --wide
-#xfail: "avr-*-*" "dlx-*-*" "h8300-*-*" "i960-*-*" "ip2k-*-*" "m32r-*-*"
+#readelf: -S --wide
+#xfail: "dlx-*-*" "h8300-*-*" "i960-*-*" "ip2k-*-*" "m32r-*-*"
 #xfail: "moxie-*-*" "mt-*-*" "visium-*-*" "*-*-nacl*"
 #xfail: "*-*-hpux*" "hppa*64*-*-*"
-# Fails on the AVR, DLX, H8300, I960, IP2K, M32R, MOXIE, MT, VISIUM
+# Fails on the DLX, H8300, I960, IP2K, M32R, MOXIE, MT, VISIUM
 #  and all NaCl targets,
 #  because the two sections are not merged into one segment.
 #  (There is no good reason why they have to be).
@@ -13,11 +13,8 @@
 # Fails on hppa64 because a PHDR is always added.
 
 #...
-Program Headers:
-  Type.*
-  LOAD +0x[0-9a-f]+ 0x0*0 0x0*0 0x0*01(6[1-9a-f]|70) 0x0*01(6[1-9a-f]|70) RWE 0x[0-9a-f]+
-
+Section Headers:
 #...
-  Segment Sections...
-   00[ \t]+.text .post_text_reserve[ \t]*
+  \[[ 0-9]+\] \.text.*[ \t]+PROGBITS[ \t0-9a-f]+AX.*
+  \[[ 0-9]+\] \.post_text_reserve.*[ \t]+PROGBITS[ \t0-9a-f]+AX.*
 #pass
diff --git a/ld/testsuite/ld-elf/merge.d b/ld/testsuite/ld-elf/merge.d
index 17f3c06..7c1e4f0 100644
--- a/ld/testsuite/ld-elf/merge.d
+++ b/ld/testsuite/ld-elf/merge.d
@@ -1,7 +1,7 @@
 #source: merge.s
 #ld: -T merge.ld
 #objdump: -s
-#xfail: "avr-*-*" "bfin-*-*" "cr16-*-*" "cris*-*-*" "crx-*-*" "d10v-*-*" "d30v-*-*"
+#xfail: "bfin-*-*" "cr16-*-*" "cris*-*-*" "crx-*-*" "d10v-*-*" "d30v-*-*"
 #xfail: "dlx-*-*" "fr30-*-*" "frv-*-*" "hppa*64*-*-*" "h8300-*-*" "score-*-*"
 #xfail: "i370-*-*" "i860-*-*" "i960-*-*" "ip2k-*-*" "iq2000-*-*" "lm32-*-*"
 #xfail: "mcore-*-*" "mn102*-*-*" "ms1-*-*" "mep-*-*"