From 197b262f98ff01516921b3d3056d86a9577535be Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Fri, 27 Apr 2018 15:25:20 +0100 Subject: [PATCH] MIPS/LD/testsuite: Update `run_dump_test' cases for non-DSO targets Mark these `run_dump_test' cases across `ld-mips-elf/mips-elf.exp' that are run unconditionally and require shared library support for exclusion for targets that do not have such support, removing these failures: FAIL: MIPS BAL/JALX in PIC mode FAIL: microMIPS BAL/JALX in PIC mode FAIL: MIPS BAL/JALX in PIC mode (ignore branch ISA) FAIL: microMIPS BAL/JALX in PIC mode (ignore branch ISA) FAIL: ld-mips-elf/hash1a FAIL: ld-mips-elf/hash1b FAIL: ld-mips-elf/hash1c with `mipsel-ps2-elf' and `mips64el-ps2-elf' targets. Tests that are guarded with `linux_gnu' will have to be reviewed separately. ld/ * testsuite/ld-mips-elf/bal-jalx-pic.d: Only run for `check_shared_lib_support' targets. * testsuite/ld-mips-elf/bal-jalx-pic-n32.d: Likewise. * testsuite/ld-mips-elf/bal-jalx-pic-n64.d: Likewise. * testsuite/ld-mips-elf/bal-jalx-pic-micromips.d: Likewise. * testsuite/ld-mips-elf/bal-jalx-pic-micromips-n32.d: Likewise. * testsuite/ld-mips-elf/bal-jalx-pic-micromips-n64.d: Likewise. * testsuite/ld-mips-elf/bal-jalx-pic-ignore.d: Likewise. * testsuite/ld-mips-elf/bal-jalx-pic-ignore-n32.d: Likewise. * testsuite/ld-mips-elf/bal-jalx-pic-ignore-n64.d: Likewise. * testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips.d: Likewise. * testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n32.d: Likewise. * testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n64.d: Likewise. * testsuite/ld-mips-elf/hash1a.d: Likewise. * testsuite/ld-mips-elf/hash1b.d: Likewise. * testsuite/ld-mips-elf/hash1c.d: Likewise. * testsuite/ld-mips-elf/relax-jalr-n32-shared.d: Likewise. * testsuite/ld-mips-elf/relax-jalr-n64-shared.d: Likewise. --- ld/ChangeLog | 24 +++++++++++++++++++ .../bal-jalx-pic-ignore-micromips-n32.d | 1 + .../bal-jalx-pic-ignore-micromips-n64.d | 1 + .../bal-jalx-pic-ignore-micromips.d | 1 + .../ld-mips-elf/bal-jalx-pic-ignore-n32.d | 1 + .../ld-mips-elf/bal-jalx-pic-ignore-n64.d | 1 + .../ld-mips-elf/bal-jalx-pic-ignore.d | 1 + .../ld-mips-elf/bal-jalx-pic-micromips-n32.d | 1 + .../ld-mips-elf/bal-jalx-pic-micromips-n64.d | 1 + .../ld-mips-elf/bal-jalx-pic-micromips.d | 1 + ld/testsuite/ld-mips-elf/bal-jalx-pic-n32.d | 1 + ld/testsuite/ld-mips-elf/bal-jalx-pic-n64.d | 1 + ld/testsuite/ld-mips-elf/bal-jalx-pic.d | 1 + ld/testsuite/ld-mips-elf/hash1a.d | 1 + ld/testsuite/ld-mips-elf/hash1b.d | 1 + ld/testsuite/ld-mips-elf/hash1c.d | 1 + .../ld-mips-elf/relax-jalr-n32-shared.d | 1 + .../ld-mips-elf/relax-jalr-n64-shared.d | 1 + 18 files changed, 41 insertions(+) diff --git a/ld/ChangeLog b/ld/ChangeLog index 21ec5877660..d11cd0608cf 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,27 @@ +2018-04-27 Maciej W. Rozycki + + * testsuite/ld-mips-elf/bal-jalx-pic.d: Only run for + `check_shared_lib_support' targets. + * testsuite/ld-mips-elf/bal-jalx-pic-n32.d: Likewise. + * testsuite/ld-mips-elf/bal-jalx-pic-n64.d: Likewise. + * testsuite/ld-mips-elf/bal-jalx-pic-micromips.d: Likewise. + * testsuite/ld-mips-elf/bal-jalx-pic-micromips-n32.d: Likewise. + * testsuite/ld-mips-elf/bal-jalx-pic-micromips-n64.d: Likewise. + * testsuite/ld-mips-elf/bal-jalx-pic-ignore.d: Likewise. + * testsuite/ld-mips-elf/bal-jalx-pic-ignore-n32.d: Likewise. + * testsuite/ld-mips-elf/bal-jalx-pic-ignore-n64.d: Likewise. + * testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips.d: + Likewise. + * testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n32.d: + Likewise. + * testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n64.d: + Likewise. + * testsuite/ld-mips-elf/hash1a.d: Likewise. + * testsuite/ld-mips-elf/hash1b.d: Likewise. + * testsuite/ld-mips-elf/hash1c.d: Likewise. + * testsuite/ld-mips-elf/relax-jalr-n32-shared.d: Likewise. + * testsuite/ld-mips-elf/relax-jalr-n64-shared.d: Likewise. + 2018-04-27 Maciej W. Rozycki * testsuite/lib/ld-lib.exp (run_dump_test): Use `match_target' diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n32.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n32.d index 9a293c58c11..6ebc06b18e6 100644 --- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n32.d +++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n32.d @@ -3,4 +3,5 @@ #as: -EB -n32 -march=from-abi #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared --ignore-branch-isa #objdump: -dr --prefix-addresses --show-raw-insn +#target: [check_shared_lib_support] #dump: bal-jalx-pic-ignore-micromips.d diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n64.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n64.d index 2b78bb92af5..a3b42d19ff1 100644 --- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n64.d +++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n64.d @@ -3,4 +3,5 @@ #as: -EB -64 -march=from-abi #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared --ignore-branch-isa #objdump: -dr --prefix-addresses --show-raw-insn +#target: [check_shared_lib_support] #dump: bal-jalx-pic-ignore-micromips.d diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips.d index 0b48b3ada0b..06f7c3c6c06 100644 --- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips.d +++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips.d @@ -3,6 +3,7 @@ #as: -EB -32 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared --ignore-branch-isa #objdump: -dr --prefix-addresses --show-raw-insn +#target: [check_shared_lib_support] .*: +file format .*mips.* diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-n32.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-n32.d index c402ba810b7..6602a515121 100644 --- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-n32.d +++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-n32.d @@ -3,4 +3,5 @@ #as: -EB -n32 -march=from-abi #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared --ignore-branch-isa #objdump: -dr --prefix-addresses --show-raw-insn +#target: [check_shared_lib_support] #dump: bal-jalx-pic-ignore.d diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-n64.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-n64.d index e1bbb927fa4..c6be6932bef 100644 --- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-n64.d +++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-n64.d @@ -3,4 +3,5 @@ #as: -EB -64 -march=from-abi #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared --ignore-branch-isa #objdump: -dr --prefix-addresses --show-raw-insn +#target: [check_shared_lib_support] #dump: bal-jalx-pic-ignore.d diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore.d index 279b87acbc3..203c48333a0 100644 --- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore.d +++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore.d @@ -3,6 +3,7 @@ #as: -EB -32 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared --ignore-branch-isa #objdump: -dr --prefix-addresses --show-raw-insn +#target: [check_shared_lib_support] .*: +file format .*mips.* diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n32.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n32.d index abfb2ab03c1..bd45be580f8 100644 --- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n32.d +++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n32.d @@ -2,5 +2,6 @@ #source: ../../../gas/testsuite/gas/mips/branch-addend-micromips.s #as: -EB -n32 -march=from-abi #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared +#target: [check_shared_lib_support] #error: \A[^\n]*: in function `bar':\n #error: \(\.text\+0x1014\): unsupported branch between ISA modes\Z diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n64.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n64.d index e73b5deb984..4817d0b6a82 100644 --- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n64.d +++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n64.d @@ -2,5 +2,6 @@ #source: ../../../gas/testsuite/gas/mips/branch-addend-micromips.s #as: -EB -64 -march=from-abi #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared +#target: [check_shared_lib_support] #error: \A[^\n]*: in function `bar':\n #error: \(\.text\+0x1014\): unsupported branch between ISA modes\Z diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips.d index cadbda08f6e..70b2ee72167 100644 --- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips.d +++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips.d @@ -2,5 +2,6 @@ #source: ../../../gas/testsuite/gas/mips/branch-addend-micromips.s #as: -EB -32 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared +#target: [check_shared_lib_support] #error: \A[^\n]*: in function `bar':\n #error: \(\.text\+0x1014\): unsupported branch between ISA modes\Z diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-n32.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-n32.d index e9956831bbc..215c3308bd3 100644 --- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-n32.d +++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-n32.d @@ -2,5 +2,6 @@ #source: ../../../gas/testsuite/gas/mips/branch-addend.s #as: -EB -n32 -march=from-abi #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared +#target: [check_shared_lib_support] #error: \A[^\n]*: in function `bar':\n #error: \(\.text\+0x1014\): unsupported branch between ISA modes\Z diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-n64.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-n64.d index a82a8666e2b..decd6eafcc7 100644 --- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-n64.d +++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-n64.d @@ -2,5 +2,6 @@ #source: ../../../gas/testsuite/gas/mips/branch-addend.s #as: -EB -64 -march=from-abi #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared +#target: [check_shared_lib_support] #error: \A[^\n]*: in function `bar':\n #error: \(\.text\+0x1014\): unsupported branch between ISA modes\Z diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic.d index 696702356d7..483608ad597 100644 --- a/ld/testsuite/ld-mips-elf/bal-jalx-pic.d +++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic.d @@ -2,5 +2,6 @@ #source: ../../../gas/testsuite/gas/mips/branch-addend.s #as: -EB -32 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared +#target: [check_shared_lib_support] #error: \A[^\n]*: in function `bar':\n #error: \(\.text\+0x1014\): unsupported branch between ISA modes\Z diff --git a/ld/testsuite/ld-mips-elf/hash1a.d b/ld/testsuite/ld-mips-elf/hash1a.d index f3adaa8d5e7..c189c93acd0 100644 --- a/ld/testsuite/ld-mips-elf/hash1a.d +++ b/ld/testsuite/ld-mips-elf/hash1a.d @@ -1,4 +1,5 @@ #source: hash1.s #ld: -shared --hash-style=sysv #objdump: -dr +#target: [check_shared_lib_support] #pass diff --git a/ld/testsuite/ld-mips-elf/hash1b.d b/ld/testsuite/ld-mips-elf/hash1b.d index 5af9037cfc3..5cafede5ebd 100644 --- a/ld/testsuite/ld-mips-elf/hash1b.d +++ b/ld/testsuite/ld-mips-elf/hash1b.d @@ -1,3 +1,4 @@ #source: hash1.s #ld: -shared --hash-style=both +#target: [check_shared_lib_support] #error: .gnu.hash is incompatible with the MIPS ABI diff --git a/ld/testsuite/ld-mips-elf/hash1c.d b/ld/testsuite/ld-mips-elf/hash1c.d index 09bff3cad96..379620af20b 100644 --- a/ld/testsuite/ld-mips-elf/hash1c.d +++ b/ld/testsuite/ld-mips-elf/hash1c.d @@ -1,3 +1,4 @@ #source: hash1.s #ld: -shared --hash-style=gnu +#target: [check_shared_lib_support] #error: .gnu.hash is incompatible with the MIPS ABI diff --git a/ld/testsuite/ld-mips-elf/relax-jalr-n32-shared.d b/ld/testsuite/ld-mips-elf/relax-jalr-n32-shared.d index 2eb81522319..597c8091c86 100644 --- a/ld/testsuite/ld-mips-elf/relax-jalr-n32-shared.d +++ b/ld/testsuite/ld-mips-elf/relax-jalr-n32-shared.d @@ -3,6 +3,7 @@ #as: -march=from-abi -KPIC -n32 -EB #objdump: --prefix-addresses -d --show-raw-insn #ld: -shared -melf32btsmipn32 +#target: [check_shared_lib_support] .*: file format elf.*mips.* diff --git a/ld/testsuite/ld-mips-elf/relax-jalr-n64-shared.d b/ld/testsuite/ld-mips-elf/relax-jalr-n64-shared.d index fcb0b126e31..e46fba2b85c 100644 --- a/ld/testsuite/ld-mips-elf/relax-jalr-n64-shared.d +++ b/ld/testsuite/ld-mips-elf/relax-jalr-n64-shared.d @@ -3,6 +3,7 @@ #as: -march=from-abi -KPIC -64 -EB #objdump: --prefix-addresses -d --show-raw-insn #ld: -shared -melf64btsmip +#target: [check_shared_lib_support] .*: file format elf.*mips.* -- 2.30.2