From e491e58adce317f8ed46aa7a15dc563131996c50 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Wed, 30 Aug 2017 12:20:53 +0100 Subject: [PATCH] MIPS/GAS/testsuite: Deduplicate error lists of branch local tests Complement commit 7795a8f8bdde ("MIPS/GAS/testsuite: Convert branch local list tests to dump tests") and share identical error lists among branch local tests, removing duplicate copies. gas/ * testsuite/gas/mips/branch-local-n32-2.d: Use `branch-local-2.l' for `error-output'. * testsuite/gas/mips/branch-local-n64-2.d: Likewise. * testsuite/gas/mips/branch-local-n32-3.d: Use `branch-local-3.l' for `error-output'. * testsuite/gas/mips/branch-local-n64-3.d: Likewise. * testsuite/gas/mips/branch-local-n32-2.l: Remove file. * testsuite/gas/mips/branch-local-n64-2.l: Remove file. * testsuite/gas/mips/branch-local-n32-3.l: Remove file. * testsuite/gas/mips/branch-local-n64-3.l: Remove file. --- gas/ChangeLog | 13 +++++++++++++ gas/testsuite/gas/mips/branch-local-n32-2.d | 2 +- gas/testsuite/gas/mips/branch-local-n32-2.l | 5 ----- gas/testsuite/gas/mips/branch-local-n32-3.d | 2 +- gas/testsuite/gas/mips/branch-local-n32-3.l | 3 --- gas/testsuite/gas/mips/branch-local-n64-2.d | 2 +- gas/testsuite/gas/mips/branch-local-n64-2.l | 5 ----- gas/testsuite/gas/mips/branch-local-n64-3.d | 2 +- gas/testsuite/gas/mips/branch-local-n64-3.l | 3 --- 9 files changed, 17 insertions(+), 20 deletions(-) delete mode 100644 gas/testsuite/gas/mips/branch-local-n32-2.l delete mode 100644 gas/testsuite/gas/mips/branch-local-n32-3.l delete mode 100644 gas/testsuite/gas/mips/branch-local-n64-2.l delete mode 100644 gas/testsuite/gas/mips/branch-local-n64-3.l diff --git a/gas/ChangeLog b/gas/ChangeLog index 3e250d3d932..2e60e29a3c6 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,16 @@ +2017-08-30 Maciej W. Rozycki + + * testsuite/gas/mips/branch-local-n32-2.d: Use `branch-local-2.l' + for `error-output'. + * testsuite/gas/mips/branch-local-n64-2.d: Likewise. + * testsuite/gas/mips/branch-local-n32-3.d: Use `branch-local-3.l' + for `error-output'. + * testsuite/gas/mips/branch-local-n64-3.d: Likewise. + * testsuite/gas/mips/branch-local-n32-2.l: Remove file. + * testsuite/gas/mips/branch-local-n64-2.l: Remove file. + * testsuite/gas/mips/branch-local-n32-3.l: Remove file. + * testsuite/gas/mips/branch-local-n64-3.l: Remove file. + 2017-08-29 Jozef Lawrynowicz * config/tc-msp430.c (md_parse_option): Define high data and high diff --git a/gas/testsuite/gas/mips/branch-local-n32-2.d b/gas/testsuite/gas/mips/branch-local-n32-2.d index 53b76f4d8ff..025a12ce49b 100644 --- a/gas/testsuite/gas/mips/branch-local-n32-2.d +++ b/gas/testsuite/gas/mips/branch-local-n32-2.d @@ -1,3 +1,3 @@ #name: MIPS branch local symbol relocation 2 (n32) #as: -n32 -march=from-abi -#error-output: branch-local-n32-2.l +#error-output: branch-local-2.l diff --git a/gas/testsuite/gas/mips/branch-local-n32-2.l b/gas/testsuite/gas/mips/branch-local-n32-2.l deleted file mode 100644 index 4f93bf34f40..00000000000 --- a/gas/testsuite/gas/mips/branch-local-n32-2.l +++ /dev/null @@ -1,5 +0,0 @@ -.*: Assembler messages: -.*:19: Error: branch to a symbol in another ISA mode -.*:21: Error: branch to a symbol in another ISA mode -.*:23: Error: branch to a symbol in another ISA mode -.*:25: Error: branch to a symbol in another ISA mode diff --git a/gas/testsuite/gas/mips/branch-local-n32-3.d b/gas/testsuite/gas/mips/branch-local-n32-3.d index 8ef63ef11f5..9d84b80634e 100644 --- a/gas/testsuite/gas/mips/branch-local-n32-3.d +++ b/gas/testsuite/gas/mips/branch-local-n32-3.d @@ -1,3 +1,3 @@ #name: MIPS branch local symbol relocation 3 (n32) #as: -n32 -march=from-abi -#error-output: branch-local-n32-3.l +#error-output: branch-local-3.l diff --git a/gas/testsuite/gas/mips/branch-local-n32-3.l b/gas/testsuite/gas/mips/branch-local-n32-3.l deleted file mode 100644 index 39fb31fb59e..00000000000 --- a/gas/testsuite/gas/mips/branch-local-n32-3.l +++ /dev/null @@ -1,3 +0,0 @@ -.*: Assembler messages: -.*:20: Error: branch to a symbol in another ISA mode -.*:22: Error: branch to a symbol in another ISA mode diff --git a/gas/testsuite/gas/mips/branch-local-n64-2.d b/gas/testsuite/gas/mips/branch-local-n64-2.d index b14b1bd32fa..46c48ffb347 100644 --- a/gas/testsuite/gas/mips/branch-local-n64-2.d +++ b/gas/testsuite/gas/mips/branch-local-n64-2.d @@ -1,3 +1,3 @@ #name: MIPS branch local symbol relocation 2 (n64) #as: -64 -march=from-abi -#error-output: branch-local-n64-2.l +#error-output: branch-local-2.l diff --git a/gas/testsuite/gas/mips/branch-local-n64-2.l b/gas/testsuite/gas/mips/branch-local-n64-2.l deleted file mode 100644 index 4f93bf34f40..00000000000 --- a/gas/testsuite/gas/mips/branch-local-n64-2.l +++ /dev/null @@ -1,5 +0,0 @@ -.*: Assembler messages: -.*:19: Error: branch to a symbol in another ISA mode -.*:21: Error: branch to a symbol in another ISA mode -.*:23: Error: branch to a symbol in another ISA mode -.*:25: Error: branch to a symbol in another ISA mode diff --git a/gas/testsuite/gas/mips/branch-local-n64-3.d b/gas/testsuite/gas/mips/branch-local-n64-3.d index e12f1537e5c..f588beaef36 100644 --- a/gas/testsuite/gas/mips/branch-local-n64-3.d +++ b/gas/testsuite/gas/mips/branch-local-n64-3.d @@ -1,3 +1,3 @@ #name: MIPS branch local symbol relocation 3 (n64) #as: -64 -march=from-abi -#error-output: branch-local-n64-3.l +#error-output: branch-local-3.l diff --git a/gas/testsuite/gas/mips/branch-local-n64-3.l b/gas/testsuite/gas/mips/branch-local-n64-3.l deleted file mode 100644 index 39fb31fb59e..00000000000 --- a/gas/testsuite/gas/mips/branch-local-n64-3.l +++ /dev/null @@ -1,3 +0,0 @@ -.*: Assembler messages: -.*:20: Error: branch to a symbol in another ISA mode -.*:22: Error: branch to a symbol in another ISA mode -- 2.30.2