diff options
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | binutils/testsuite/binutils-all/nm.exp | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog index 97c563052cc..25d66458ff5 100644 --- a/binutils/testsuite/ChangeLog +++ b/binutils/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-08-21 Hans-Peter Nilsson <hp@bitrange.com> + + * binutils-all/nm.exp: Revert last change. Instead use nm-elf-1.s + for mmix-knuth-mmixware. + 2013-08-20 Hans-Peter Nilsson <hp@bitrange.com> * binutils-all/nm.exp: Xfail test for nm --size-sort for diff --git a/binutils/testsuite/binutils-all/nm.exp b/binutils/testsuite/binutils-all/nm.exp index 9c79e4c110f..8b9b9af25c1 100644 --- a/binutils/testsuite/binutils-all/nm.exp +++ b/binutils/testsuite/binutils-all/nm.exp @@ -157,7 +157,10 @@ if [regexp $want $got] then { # Test nm --size-sort -if [is_elf_format] { +# 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"]} { set nm_1_src "nm-elf-1.s" } else { set nm_1_src "nm-1.s" @@ -179,10 +182,6 @@ setup_xfail "alpha*-*-osf*" "alpha*-*-netware*" setup_xfail "mips*-*-ultrix*" "mips*-*-ecoff*" "mips*-*-irix4*" setup_xfail "mips*-*-riscos*" "mips*-*-sysv3*" "mips*-sony-bsd*" -# It also doesn't work with the MMO object format, because a MMO -# symbol has no size information. -setup_xfail "mmix-knuth-mmixware" - set got [binutils_run $NM "$NMFLAGS --size-sort $tempfile"] set want "0*4 T text_symbol3.*0*8 T text_symbol2.*0*c T text_symbol1" |