* ld-arm/export-class.exp: Handle non-EABI targets.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 7e3b35a35fc3bdca75b079aefd1efedf803f6822..f6858edf136e98d9a7b0166cc8b0c64f9a1e84bb 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-24  Maciej W. Rozycki  <macro@linux-mips.org>
+
+       * ld-arm/export-class.exp: Handle non-EABI targets.
+
 2013-08-23  Roland McGrath  <mcgrathr@google.com>
 
        * ld-x86-64/ilp32-4-nacl.d: Update for 2013-05-31 gas alignment change.

diff --git a/ld/testsuite/ld-arm/export-class.exp b/ld/testsuite/ld-arm/export-class.exp
index 1eeb9c387f5ad02292115d748aeacd36e9d6713c..4e33389f4cc5a1bfe3158d5344a6110ba6f064ff 100644 (file)
--- a/ld/testsuite/ld-arm/export-class.exp
+++ b/ld/testsuite/ld-arm/export-class.exp
@@ -32,12 +32,18 @@ if { ![istarget arm*-*-linux*] } {
 
 set testname "ARM symbol export class test"
 
+if [istarget arm*-*-linux*eabi] {
+    set emul armelf_linux_eabi
+} else {
+    set emul armelf_linux
+}
+
 # Build an auxiliary shared object with conflicting versioned symbol
 # definitions.
 run_ld_link_tests [list \
     [list \
        "$testname (auxiliary shared object)" \
-       "-marmelf_linux_eabi -shared -version-script ../ld-elf/export-class-lib.ver" "" \
+       "-m$emul -shared -version-script ../ld-elf/export-class-lib.ver" "" \
        "-EL" \
        { ../ld-elf/export-class-lib.s } \
        {} \
@@ -51,7 +57,7 @@ run_ld_link_tests [list \
 run_ld_link_tests [list \
     [list \
        "$testname (initial static object)" \
-       "-marmelf_linux_eabi -r" "" \
+       "-m$emul -r" "" \
        "-EL" \
        { ../ld-elf/export-class-ref.s } \
        {} \
@@ -68,7 +74,7 @@ run_ld_link_tests [list \
 run_ld_link_tests [list \
     [list \
        "$testname (final shared object)" \
-       "-marmelf_linux_eabi -shared -Tdata=0x12340000 tmpdir/arm-export-class-ref-r.o tmpdir/arm-export-class-lib.so" "" \
+       "-m$emul -shared -Tdata=0x12340000 tmpdir/arm-export-class-ref-r.o tmpdir/arm-export-class-lib.so" "" \
        "-EL" \
        { ../ld-elf/export-class-dep.s ../ld-elf/export-class-def.s } \
        { \