aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2013-08-22 11:29:43 +0000
committerNick Clifton <nickc@redhat.com>2013-08-22 11:29:43 +0000
commit3ce958b2ab9f0d1f6c4f12bdc42ea7e8cb21dd6a (patch)
treecdd2d00a02bad048806304d6c3e437eb3e4b80f7
parent6be7b56e0072f516ed2ffceab196018025bc32a9 (diff)
downloadgdb-3ce958b2ab9f0d1f6c4f12bdc42ea7e8cb21dd6a.zip
gdb-3ce958b2ab9f0d1f6c4f12bdc42ea7e8cb21dd6a.tar.gz
gdb-3ce958b2ab9f0d1f6c4f12bdc42ea7e8cb21dd6a.tar.bz2
* binutils-all/nm.exp: --size-sort test: Add more ELF-like
targets. * binutils-all/nm-1.s: Use .byte instead of .long. Provide a terminating symbol.
-rw-r--r--binutils/testsuite/ChangeLog7
-rw-r--r--binutils/testsuite/binutils-all/nm-1.s14
-rw-r--r--binutils/testsuite/binutils-all/nm.exp18
3 files changed, 31 insertions, 8 deletions
diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 25d6645..a7fd24b 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2013-08-22 Nick Clifton <nickc@redhat.com>
+
+ * binutils-all/nm.exp: --size-sort test: Add more ELF-like
+ targets.
+ * binutils-all/nm-1.s: Use .byte instead of .long.
+ Provide a terminating symbol.
+
2013-08-21 Hans-Peter Nilsson <hp@bitrange.com>
* binutils-all/nm.exp: Revert last change. Instead use nm-elf-1.s
diff --git a/binutils/testsuite/binutils-all/nm-1.s b/binutils/testsuite/binutils-all/nm-1.s
index 5fe4cd7..7f1633c3 100644
--- a/binutils/testsuite/binutils-all/nm-1.s
+++ b/binutils/testsuite/binutils-all/nm-1.s
@@ -1,13 +1,15 @@
.globl text_symbol1
.globl text_symbol2
.globl text_symbol3
+ .globl end_symbol
.text
text_symbol1:
- .long 0
- .long 0
- .long 0
+ .byte 0,0,0,0
+ .byte 0,0,0,0
+ .byte 0,0,0,0
text_symbol2:
- .long 0
- .long 0
+ .byte 0,0,0,0
+ .byte 0,0,0,0
text_symbol3:
- .long 0
+ .byte 0,0,0,0
+end_symbol:
diff --git a/binutils/testsuite/binutils-all/nm.exp b/binutils/testsuite/binutils-all/nm.exp
index 8b9b9af..e9e7f5f 100644
--- a/binutils/testsuite/binutils-all/nm.exp
+++ b/binutils/testsuite/binutils-all/nm.exp
@@ -159,8 +159,22 @@ if [regexp $want $got] then {
# The target exceptions here are intended for targets that have ELF as
# an intermediate format or otherwise require the ELF-variant syntax
-# for proper size annotation.
-if {[is_elf_format] || [istarget "mmix-knuth-mmixware"]} {
+# for proper size annotation. It would be nice if is_elf_format found
+# all the ELF variants, but adding the patterns here to that proc then
+# introduces a whole slew of new regressions in the GAS and LD testsuites.
+if { [is_elf_format]
+ || [istarget *-*-dragonfly*]
+ || [istarget *-*-*elf]
+ || [istarget *-*-freebsd*]
+ || [istarget *-*-lynxos*]
+ || [istarget "mmix-knuth-mmixware"]
+ || [istarget *-*-netware*]
+ || [istarget *-*-nto*]
+ || [istarget *-*-rdos*]
+ || [istarget *-*-tpf*]
+ || [istarget *-*-uclinux*]
+ || [istarget ia64-*-*vms*]
+ || [istarget *-*-vxworks*] } {
set nm_1_src "nm-elf-1.s"
} else {
set nm_1_src "nm-1.s"