summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPitchumani Sivanupandi <pitchumani.s@atmel.com>2016-05-09 12:04:16 +0100
committerNick Clifton <nickc@redhat.com>2016-05-09 12:06:24 +0100
commit924bc11ba455cfe5e44afa3cb24e4dbe24536734 (patch)
tree28fa349e56b720fb53f18e2e0ad1b1faf9266ca0
parentd751b79ea6bd7721367f1d78d22b70cee161fc26 (diff)
downloadbinutils-gdb-924bc11ba455cfe5e44afa3cb24e4dbe24536734.tar.gz
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-*-*.
-rw-r--r--ld/ChangeLog8
-rw-r--r--ld/testsuite/ld-elf/flags1.d15
-rw-r--r--ld/testsuite/ld-elf/merge.d2
3 files changed, 15 insertions, 10 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index ea43adbe249..2e07395c2d2 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 e7c6b4f5eef..09ac477155c 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 17f3c06dd31..7c1e4f054f7 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-*-*"