aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog13
-rw-r--r--gas/testsuite/gas/mips/branch-local-n32-2.d2
-rw-r--r--gas/testsuite/gas/mips/branch-local-n32-2.l5
-rw-r--r--gas/testsuite/gas/mips/branch-local-n32-3.d2
-rw-r--r--gas/testsuite/gas/mips/branch-local-n32-3.l3
-rw-r--r--gas/testsuite/gas/mips/branch-local-n64-2.d2
-rw-r--r--gas/testsuite/gas/mips/branch-local-n64-2.l5
-rw-r--r--gas/testsuite/gas/mips/branch-local-n64-3.d2
-rw-r--r--gas/testsuite/gas/mips/branch-local-n64-3.l3
9 files changed, 17 insertions, 20 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3e250d3..2e60e29 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,16 @@
+2017-08-30 Maciej W. Rozycki <macro@imgtec.com>
+
+ * 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 <jozef.l@somniumtech.com>
* 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 53b76f4..025a12c 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 4f93bf3..0000000
--- 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 8ef63ef..9d84b80 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 39fb31f..0000000
--- 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 b14b1bd..46c48ff 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 4f93bf3..0000000
--- 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 e12f153..f588bea 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 39fb31f..0000000
--- 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