[binutils-gdb] Revert "MIPS: correct macro use in gas and ld testsuites"

H.J. Lu hjl@sourceware.org
Thu Aug 15 16:49:55 GMT 2024


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=4184396d5878a49c3e25d28d76a278940f5fbe6b

commit 4184396d5878a49c3e25d28d76a278940f5fbe6b
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Wed Aug 14 09:54:33 2024 -0700

    Revert "MIPS: correct macro use in gas and ld testsuites"
    
    This reverts commit c0e9aca554e33e900efbd6425c1830f0a20012f5.
    
    commit 6ae8a30d44f016cafb46a75843b5109316eb1996
    Author: Jan Beulich <jbeulich@suse.com>
    Date:   Fri Aug 9 11:59:31 2024 +0200
    
        gas: have scrubber retain more whitespace
    
    has been reverted to fix PR gas/32073.

Diff:
---
 gas/testsuite/gas/mips/unaligned-branch-1.s           | 4 ++--
 gas/testsuite/gas/mips/unaligned-branch-2.s           | 4 ++--
 gas/testsuite/gas/mips/unaligned-branch-micromips-1.s | 4 ++--
 gas/testsuite/gas/mips/unaligned-branch-micromips-2.s | 4 ++--
 gas/testsuite/gas/mips/unaligned-branch-mips16-1.s    | 4 ++--
 gas/testsuite/gas/mips/unaligned-branch-mips16-2.s    | 4 ++--
 gas/testsuite/gas/mips/unaligned-branch-r6-1.s        | 4 ++--
 gas/testsuite/gas/mips/unaligned-branch-r6-2.s        | 4 ++--
 gas/testsuite/gas/mips/unaligned-branch-r6-3.s        | 4 ++--
 gas/testsuite/gas/mips/unaligned-branch-r6-4.s        | 4 ++--
 gas/testsuite/gas/mips/unaligned-jump-1.s             | 4 ++--
 gas/testsuite/gas/mips/unaligned-jump-2.s             | 4 ++--
 gas/testsuite/gas/mips/unaligned-jump-micromips-1.s   | 4 ++--
 gas/testsuite/gas/mips/unaligned-jump-micromips-2.s   | 4 ++--
 gas/testsuite/gas/mips/unaligned-jump-mips16-1.s      | 4 ++--
 gas/testsuite/gas/mips/unaligned-jump-mips16-2.s      | 4 ++--
 ld/testsuite/ld-mips-elf/unaligned-data.s             | 2 +-
 ld/testsuite/ld-mips-elf/unaligned-insn.s             | 2 +-
 ld/testsuite/ld-mips-elf/unaligned-text.s             | 2 +-
 19 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/gas/testsuite/gas/mips/unaligned-branch-1.s b/gas/testsuite/gas/mips/unaligned-branch-1.s
index b99a63e6a1a..bc976a29471 100644
--- a/gas/testsuite/gas/mips/unaligned-branch-1.s
+++ b/gas/testsuite/gas/mips/unaligned-branch-1.s
@@ -116,7 +116,7 @@ bar\@ :
 	.byte	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	obj	(\n - 1)
+	obj	\n - 1
 	.endif
 	.endm
 
@@ -127,7 +127,7 @@ bar\@ :
 	.hword	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	fun	(\n - 1)
+	fun	\n - 1
 	.endif
 	.endm
 
diff --git a/gas/testsuite/gas/mips/unaligned-branch-2.s b/gas/testsuite/gas/mips/unaligned-branch-2.s
index 9a60d27f2af..2f892c77a20 100644
--- a/gas/testsuite/gas/mips/unaligned-branch-2.s
+++ b/gas/testsuite/gas/mips/unaligned-branch-2.s
@@ -117,7 +117,7 @@ bar\@ :
 	.byte	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	obj	(\n - 1)
+	obj	\n - 1
 	.endif
 	.endm
 
@@ -129,7 +129,7 @@ bar\@ :
 	.hword	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	fun	(\n - 1)
+	fun	\n - 1
 	.endif
 	.endm
 
diff --git a/gas/testsuite/gas/mips/unaligned-branch-micromips-1.s b/gas/testsuite/gas/mips/unaligned-branch-micromips-1.s
index ada52839774..bec74ed1412 100644
--- a/gas/testsuite/gas/mips/unaligned-branch-micromips-1.s
+++ b/gas/testsuite/gas/mips/unaligned-branch-micromips-1.s
@@ -181,7 +181,7 @@ bar\@ :
 	.byte	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	obj	(\n - 1)
+	obj	\n - 1
 	.endif
 	.endm
 
@@ -192,7 +192,7 @@ bar\@ :
 	.hword	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	fun	(\n - 1)
+	fun	\n - 1
 	.endif
 	.endm
 
diff --git a/gas/testsuite/gas/mips/unaligned-branch-micromips-2.s b/gas/testsuite/gas/mips/unaligned-branch-micromips-2.s
index f3f39803ba4..e65601e2094 100644
--- a/gas/testsuite/gas/mips/unaligned-branch-micromips-2.s
+++ b/gas/testsuite/gas/mips/unaligned-branch-micromips-2.s
@@ -182,7 +182,7 @@ bar\@ :
 	.byte	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	obj	(\n - 1)
+	obj	\n - 1
 	.endif
 	.endm
 
@@ -194,7 +194,7 @@ bar\@ :
 	.hword	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	fun	(\n - 1)
+	fun	\n - 1
 	.endif
 	.endm
 
diff --git a/gas/testsuite/gas/mips/unaligned-branch-mips16-1.s b/gas/testsuite/gas/mips/unaligned-branch-mips16-1.s
index 6bc8b2919bf..d4fad965962 100644
--- a/gas/testsuite/gas/mips/unaligned-branch-mips16-1.s
+++ b/gas/testsuite/gas/mips/unaligned-branch-mips16-1.s
@@ -85,7 +85,7 @@ bar\@ :
 	.byte	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	obj	(\n - 1)
+	obj	\n - 1
 	.endif
 	.endm
 
@@ -96,7 +96,7 @@ bar\@ :
 	.hword	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	fun	(\n - 1)
+	fun	\n - 1
 	.endif
 	.endm
 
diff --git a/gas/testsuite/gas/mips/unaligned-branch-mips16-2.s b/gas/testsuite/gas/mips/unaligned-branch-mips16-2.s
index 5476cae40dc..0a6e55327ac 100644
--- a/gas/testsuite/gas/mips/unaligned-branch-mips16-2.s
+++ b/gas/testsuite/gas/mips/unaligned-branch-mips16-2.s
@@ -86,7 +86,7 @@ bar\@ :
 	.byte	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	obj	(\n - 1)
+	obj	\n - 1
 	.endif
 	.endm
 
@@ -98,7 +98,7 @@ bar\@ :
 	.hword	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	fun	(\n - 1)
+	fun	\n - 1
 	.endif
 	.endm
 
diff --git a/gas/testsuite/gas/mips/unaligned-branch-r6-1.s b/gas/testsuite/gas/mips/unaligned-branch-r6-1.s
index 0e48b29fb2d..1e5960cbe09 100644
--- a/gas/testsuite/gas/mips/unaligned-branch-r6-1.s
+++ b/gas/testsuite/gas/mips/unaligned-branch-r6-1.s
@@ -118,7 +118,7 @@ bar\@ :
 	.byte	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	obj	(\n - 1)
+	obj	\n - 1
 	.endif
 	.endm
 
@@ -129,7 +129,7 @@ bar\@ :
 	.hword	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	fun	(\n - 1)
+	fun	\n - 1
 	.endif
 	.endm
 
diff --git a/gas/testsuite/gas/mips/unaligned-branch-r6-2.s b/gas/testsuite/gas/mips/unaligned-branch-r6-2.s
index c1607011f6d..dc89ea0f81e 100644
--- a/gas/testsuite/gas/mips/unaligned-branch-r6-2.s
+++ b/gas/testsuite/gas/mips/unaligned-branch-r6-2.s
@@ -118,7 +118,7 @@ bar\@ :
 	.byte	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	obj	(\n - 1)
+	obj	\n - 1
 	.endif
 	.endm
 
@@ -129,7 +129,7 @@ bar\@ :
 	.hword	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	fun	(\n - 1)
+	fun	\n - 1
 	.endif
 	.endm
 
diff --git a/gas/testsuite/gas/mips/unaligned-branch-r6-3.s b/gas/testsuite/gas/mips/unaligned-branch-r6-3.s
index 62adac29ae6..beb59128d03 100644
--- a/gas/testsuite/gas/mips/unaligned-branch-r6-3.s
+++ b/gas/testsuite/gas/mips/unaligned-branch-r6-3.s
@@ -119,7 +119,7 @@ bar\@ :
 	.byte	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	obj	(\n - 1)
+	obj	\n - 1
 	.endif
 	.endm
 
@@ -131,7 +131,7 @@ bar\@ :
 	.hword	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	fun	(\n - 1)
+	fun	\n - 1
 	.endif
 	.endm
 
diff --git a/gas/testsuite/gas/mips/unaligned-branch-r6-4.s b/gas/testsuite/gas/mips/unaligned-branch-r6-4.s
index cb5ef695dd8..26a905af853 100644
--- a/gas/testsuite/gas/mips/unaligned-branch-r6-4.s
+++ b/gas/testsuite/gas/mips/unaligned-branch-r6-4.s
@@ -119,7 +119,7 @@ bar\@ :
 	.byte	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	obj	(\n - 1)
+	obj	\n - 1
 	.endif
 	.endm
 
@@ -131,7 +131,7 @@ bar\@ :
 	.hword	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	fun	(\n - 1)
+	fun	\n - 1
 	.endif
 	.endm
 
diff --git a/gas/testsuite/gas/mips/unaligned-jump-1.s b/gas/testsuite/gas/mips/unaligned-jump-1.s
index 13f85c715fc..bfdd0d3ea14 100644
--- a/gas/testsuite/gas/mips/unaligned-jump-1.s
+++ b/gas/testsuite/gas/mips/unaligned-jump-1.s
@@ -116,7 +116,7 @@ bar\@ :
 	.byte	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	obj	(\n - 1)
+	obj	\n - 1
 	.endif
 	.endm
 
@@ -127,7 +127,7 @@ bar\@ :
 	.hword	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	fun	(\n - 1)
+	fun	\n - 1
 	.endif
 	.endm
 
diff --git a/gas/testsuite/gas/mips/unaligned-jump-2.s b/gas/testsuite/gas/mips/unaligned-jump-2.s
index b2a60ab61a0..f6a951ddeca 100644
--- a/gas/testsuite/gas/mips/unaligned-jump-2.s
+++ b/gas/testsuite/gas/mips/unaligned-jump-2.s
@@ -117,7 +117,7 @@ bar\@ :
 	.byte	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	obj	(\n - 1)
+	obj	\n - 1
 	.endif
 	.endm
 
@@ -129,7 +129,7 @@ bar\@ :
 	.hword	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	fun	(\n - 1)
+	fun	\n - 1
 	.endif
 	.endm
 
diff --git a/gas/testsuite/gas/mips/unaligned-jump-micromips-1.s b/gas/testsuite/gas/mips/unaligned-jump-micromips-1.s
index 4ecfc6f6ddb..07d0a58ebda 100644
--- a/gas/testsuite/gas/mips/unaligned-jump-micromips-1.s
+++ b/gas/testsuite/gas/mips/unaligned-jump-micromips-1.s
@@ -149,7 +149,7 @@ bar\@ :
 	.byte	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	obj	(\n - 1)
+	obj	\n - 1
 	.endif
 	.endm
 
@@ -160,7 +160,7 @@ bar\@ :
 	.hword	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	fun	(\n - 1)
+	fun	\n - 1
 	.endif
 	.endm
 
diff --git a/gas/testsuite/gas/mips/unaligned-jump-micromips-2.s b/gas/testsuite/gas/mips/unaligned-jump-micromips-2.s
index 9dff6a1c7f6..9865f2ebb93 100644
--- a/gas/testsuite/gas/mips/unaligned-jump-micromips-2.s
+++ b/gas/testsuite/gas/mips/unaligned-jump-micromips-2.s
@@ -150,7 +150,7 @@ bar\@ :
 	.byte	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	obj	(\n - 1)
+	obj	\n - 1
 	.endif
 	.endm
 
@@ -162,7 +162,7 @@ bar\@ :
 	.hword	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	fun	(\n - 1)
+	fun	\n - 1
 	.endif
 	.endm
 
diff --git a/gas/testsuite/gas/mips/unaligned-jump-mips16-1.s b/gas/testsuite/gas/mips/unaligned-jump-mips16-1.s
index bed5ded9522..329264038b3 100644
--- a/gas/testsuite/gas/mips/unaligned-jump-mips16-1.s
+++ b/gas/testsuite/gas/mips/unaligned-jump-mips16-1.s
@@ -85,7 +85,7 @@ bar\@ :
 	.byte	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	obj	(\n - 1)
+	obj	\n - 1
 	.endif
 	.endm
 
@@ -96,7 +96,7 @@ bar\@ :
 	.hword	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	fun	(\n - 1)
+	fun	\n - 1
 	.endif
 	.endm
 
diff --git a/gas/testsuite/gas/mips/unaligned-jump-mips16-2.s b/gas/testsuite/gas/mips/unaligned-jump-mips16-2.s
index d6dd5ee054c..c2b15aac467 100644
--- a/gas/testsuite/gas/mips/unaligned-jump-mips16-2.s
+++ b/gas/testsuite/gas/mips/unaligned-jump-mips16-2.s
@@ -86,7 +86,7 @@ bar\@ :
 	.byte	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	obj	(\n - 1)
+	obj	\n - 1
 	.endif
 	.endm
 
@@ -98,7 +98,7 @@ bar\@ :
 	.hword	0
 	.size	bar\@, . - bar\@
 	.if	\n - 1
-	fun	(\n - 1)
+	fun	\n - 1
 	.endif
 	.endm
 
diff --git a/ld/testsuite/ld-mips-elf/unaligned-data.s b/ld/testsuite/ld-mips-elf/unaligned-data.s
index f645c151235..e865a131230 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-data.s
+++ b/ld/testsuite/ld-mips-elf/unaligned-data.s
@@ -5,7 +5,7 @@
 bar\@ :
 	.byte	0
 	.size	bar\@, . - bar\@
-	sym	(\n - 1)
+	sym	\n - 1
 	.endif
 	.endm
 
diff --git a/ld/testsuite/ld-mips-elf/unaligned-insn.s b/ld/testsuite/ld-mips-elf/unaligned-insn.s
index 5313372caf2..10649de9180 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-insn.s
+++ b/ld/testsuite/ld-mips-elf/unaligned-insn.s
@@ -6,7 +6,7 @@ bar\@ :
 	.insn
 	.hword	0
 	.size	bar\@, . - bar\@
-	sym	(\n - 1)
+	sym	\n - 1
 	.endif
 	.endm
 
diff --git a/ld/testsuite/ld-mips-elf/unaligned-text.s b/ld/testsuite/ld-mips-elf/unaligned-text.s
index 2495c4be3e5..4b3aa38ad9c 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-text.s
+++ b/ld/testsuite/ld-mips-elf/unaligned-text.s
@@ -5,7 +5,7 @@
 bar\@ :
 	.byte	0
 	.size	bar\@, . - bar\@
-	sym	(\n - 1)
+	sym	\n - 1
 	.endif
 	.endm


More information about the Binutils-cvs mailing list