Arm: correct macro use in gas testsuite

The way the inner macro invocations are written doesn't quite work as
expected (and would actually break subsequently): Due to overly
aggressive removal of whitespace by the scrubber, the incoming \sym and
\offset arguments actually get concatenated; an empty 3rd argument is
being passed to ldrtest2. That just so happened to work as intended; any
use of \offset alone would have exposed the problem. Quote the 3rd
argument, thus retaining enough whitespace to be independent of scrubber
internals.

diff --git a/gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.s b/gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.s
index ac7a90f0e9e2e8d68e421924225983c6ffca4820..7799bf114bdf913c5fb06215f977e23ba5d7737b 100644 (file)
--- a/gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.s
+++ b/gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.s
@@ -14,7 +14,7 @@
 
        .macro ldrtest load store sym offset
 
-       ldrtest2 \load \sym \offset
+       ldrtest2 \load \sym "\offset"
 
        \store  r0, [r0, #:pc_g1:(\sym \offset)]
        \store  r0, [r0, #:pc_g2:(\sym \offset)]

diff --git a/gas/testsuite/gas/arm/group-reloc-ldrs.s b/gas/testsuite/gas/arm/group-reloc-ldrs.s
index fa74e7eabe0af0fc050ac66267ac5f47a2f16ff9..96655e14d9835655f4f5aa2db44268b7a5f920e8 100644 (file)
--- a/gas/testsuite/gas/arm/group-reloc-ldrs.s
+++ b/gas/testsuite/gas/arm/group-reloc-ldrs.s
@@ -14,7 +14,7 @@
 
        .macro ldrtest load store sym offset
 
-       ldrtest2 \load \sym \offset
+       ldrtest2 \load \sym "\offset"
 
        \store  r0, [r0, #:pc_g1:(\sym \offset)]
        \store  r0, [r0, #:pc_g2:(\sym \offset)]