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 --git a/gas/testsuite/gas/mips/unaligned-branch-1.s b/gas/testsuite/gas/mips/unaligned-branch-1.s
index b99a63e6a1a0e065e6c4335bde4ca111a18653e4..bc976a29471449799a1df9d6d19ed497a2a200f2 100644 (file)
--- 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 9a60d27f2af1342a6e3be64678f68a0ff0b33e83..2f892c77a2020b987ace7921860a499df80e6a0e 100644 (file)
--- 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 ada52839774b9d790208951cdb0ce39a6afa822c..bec74ed14125a73f3f7f2c63d6c5f406b5d5692f 100644 (file)
--- 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 f3f39803ba4b080a24283150d9becfed78eae2d5..e65601e2094143963fc160c75745e35577611537 100644 (file)
--- 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 6bc8b2919bf92f4407c03f00a380682b6cda6ab9..d4fad9659625f77b95940e2b189a77fb113eb98b 100644 (file)
--- 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 5476cae40dcd6293a13e3e63e731cfa1efa1e256..0a6e55327ac7d85b439b0eedaad75e4c865554dc 100644 (file)
--- 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 0e48b29fb2dcaeeb1796fcf299e8400bd1c9f0c3..1e5960cbe0974227a81338a7befcfdb139b0f51d 100644 (file)
--- 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 c1607011f6d9b7bf4e49e2c79d1ec5d20d8230ce..dc89ea0f81e2414a6969b130126998bccc4a1919 100644 (file)
--- 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 62adac29ae628e2aa4e131e1e7710b8b73ab37d2..beb59128d03f221b01b402bbfe4b65c234125c1c 100644 (file)
--- 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 cb5ef695dd86810c5858d3ce70d93c3887deb702..26a905af853d5c9f216367d8f8ec27bf3db364b4 100644 (file)
--- 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 13f85c715fcf258b9cd106d204d332f87e9032a9..bfdd0d3ea145d1e58b30f14b8aca11fa0627b87b 100644 (file)
--- 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 b2a60ab61a0ae857705bb05d0da96a778b6f1e6a..f6a951ddecabd7f688eb01c5e8d21a3b4f4a3f2f 100644 (file)
--- 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 4ecfc6f6ddb6305227571dd053cfb283e0333b0c..07d0a58ebda1184db0e0b11a6b288c348c091476 100644 (file)
--- 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 9dff6a1c7f6a0b6ce2e648e5b85e0550299edaa0..9865f2ebb93d1bcf7401840d9b3c407e9e28f2f6 100644 (file)
--- 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 bed5ded9522c1fd08ead041f7762c1e1f34d43a3..329264038b3de7c9ae7da1717772adce9581e880 100644 (file)
--- 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 d6dd5ee054c4331c30502673ae33f3683c7e6e0e..c2b15aac4679600873a21b7e3b726ed4144fdb54 100644 (file)
--- 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 f645c151235114c921ade6ba1a58f0e678afcd59..e865a131230f63c826ce182715583c320f0c0797 100644 (file)
--- 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 5313372caf2536f370762dcc67f1ec26ca6a07c9..10649de91803d1b87fa310b3e39e722f7a504c49 100644 (file)
--- 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 2495c4be3e5d140c703deafa4ac238e2ae9b0a31..4b3aa38ad9c1cbaaec142ecc26acb31cfa28aae1 100644 (file)
--- 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