diff options
Diffstat (limited to 'ld/testsuite/ld-x86-64/x86-64.exp')
-rw-r--r-- | ld/testsuite/ld-x86-64/x86-64.exp | 54 |
1 files changed, 3 insertions, 51 deletions
diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index 7e6a2c9804a..e687c42a695 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -22,18 +22,11 @@ # Test x86_64 linking; all types of relocs. This tests the assembler and # tools like objdump as well as the linker. -if { !([istarget "x86_64-*-elf*"] - || [istarget "x86_64-*-nacl*"] - || [istarget "x86_64-*-linux*"]) } { +if { !([istarget "x86_64-*-elf*"] || [istarget "x86_64-*-linux*"]) } { return } -if [istarget "*-*-nacl*"] { - set emul "elf_x86_64_nacl" -} else { - set emul "elf_x86_64" -} - +set emul "elf_x86_64" set saved_ASFLAGS "$ASFLAGS" set ASFLAGS "$ASFLAGS -mx86-used-note=no" @@ -230,38 +223,6 @@ set x86_64tests { "--64" { dummy.s } {} "pr20550"} } -# So as to avoid rewriting every last test case here in a nacl variant, -# we use black magic to massage the generic cases into nacl-variant cases. -if [istarget "*-*-nacl*"] { - set emul elf_x86_64_nacl - - set lhs {elf(32)?_(i386|x86_64)[[:>:]]} - set rhs {&_nacl} - - # Change all the -melf_x86_64 to -melf_x86_64_nacl so linking can succeed. - regsub -all -- $lhs $x86_64tests $rhs x86_64tests - - set zlhs {-z noseparate-code -z max-page-size=0x200000} - set zrhs {} - - # Remove -z max-page-size=0x200000 -z noseparate-code since they - # generate different addresses for nacl targets. - regsub -all -- $zlhs $x86_64tests $zrhs x86_64tests - - # Same, applied to all the run_dump_test cases. - set options_regsub(ld) [list $lhs $rhs] - - # The section/segment layout differs too much for the vanilla - # readelf output files to match. So massage the cases so that - # they refer to a foo-nacl.rd file instead of a foo.rd file. - regsub -all -- {([a-z0-9]+)\.rd} $x86_64tests {\1-nacl.rd} x86_64tests - - # Likewise for PLTs. - regsub -all -- {([a-z0-9]+)\.pd} $x86_64tests {\1-nacl.pd} x86_64tests -} else { - set emul elf_x86_64 -} - run_ld_link_tests $x86_64tests set test_name "Mixed x86_64 and i386 input test 1" @@ -335,7 +296,6 @@ run_dump_test "gotplt1" run_dump_test "pie1" run_dump_test "pie2" run_dump_test "pie3" -run_dump_test "pie3-nacl" run_dump_test "pic1" run_dump_test "largecomm-1a" run_dump_test "largecomm-1b" @@ -412,7 +372,6 @@ run_dump_test "property-x86-cet5b-x32" run_dump_test "property-x86-cet6" run_dump_test "property-x86-cet6-x32" run_dump_test "pr21884" -run_dump_test "pr21884-nacl" run_dump_test "pr22071" run_dump_test "pr22115-1a" run_dump_test "pr22115-1a-x32" @@ -473,7 +432,7 @@ run_dump_test "pr25416-3" run_dump_test "pr25416-4" run_dump_test "pr26018" -if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} { +if ![istarget "x86_64-*-linux*"] { return } @@ -512,7 +471,6 @@ run_dump_test "ilp32-1" run_dump_test "ilp32-2" run_dump_test "ilp32-3" run_dump_test "ilp32-4" -run_dump_test "ilp32-4-nacl" run_dump_test "ilp32-5" run_dump_test "ilp32-6" run_dump_test "ilp32-7" @@ -564,10 +522,6 @@ run_dump_test "load1a" run_dump_test "load1b" run_dump_test "load1c" run_dump_test "load1d" -run_dump_test "load1a-nacl" -run_dump_test "load1b-nacl" -run_dump_test "load1c-nacl" -run_dump_test "load1d-nacl" run_dump_test "load2" run_dump_test "call1a" run_dump_test "call1b" @@ -591,7 +545,6 @@ run_dump_test "ifunc-textrel-2b" run_dump_test "pr18815" run_dump_test "pr19013" run_dump_test "pr19013-x32" -run_dump_test "pr19013-nacl" run_dump_test "pr19162" run_dump_test "pr19175" run_dump_test "pr18591" @@ -610,7 +563,6 @@ run_dump_test "pr19636-2a" run_dump_test "pr19636-2b" run_dump_test "pr19636-2c" run_dump_test "pr19636-2d" -run_dump_test "pr19636-2d-nacl" run_dump_test "pr19636-2e" run_dump_test "pr19636-2f" run_dump_test "pr19636-2g" |