* sim/cris/asm/nonvcv32.ms: Neutralize changed &&-in-macro gas syntax.

diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog
index dac320f33b2ccd4a7536796f0288a3b541fa1044..36e3addd5536f4e475b98b85bc0321c36d7c911a 100644 (file)
--- a/sim/testsuite/ChangeLog
+++ b/sim/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-24  Hans-Peter Nilsson  <hp@axis.com>
+
+       * sim/cris/asm/nonvcv32.ms: Neutralize changed &&-in-macro gas syntax.
+
 2010-04-26  Mike Frysinger  <vapier@gentoo.org>
 
        * Makefile.in (arch): Set to @sim_arch@.

diff --git a/sim/testsuite/sim/cris/asm/nonvcv32.ms b/sim/testsuite/sim/cris/asm/nonvcv32.ms
index 7e6ee5b1d6cfac9b447e995dd584a33670b32b9e..98af36701ff03f37c6ec2f7ebc20c9a307cfcf43 100644 (file)
--- a/sim/testsuite/sim/cris/asm/nonvcv32.ms
+++ b/sim/testsuite/sim/cris/asm/nonvcv32.ms
@@ -51,7 +51,7 @@
  .endm
 
  .macro nonvc2q insn op min=-63 max=63
- .if \op >= \min &&&& \op <= \max
+ .if (\op >= \min) && (\op <= \max)
  nonvc2 \insn,\op
  .endif
  .endm
@@ -118,12 +118,12 @@
 ; Test all applicable constant, register and memory variants of a value.
  .macro tst op
 ; Constants
- .if (\op <= 31 &&&& \op >= -32)
+ .if (\op <= 31) && (\op >= -32)
  nonvciterq \op
- .elseif (\op <= 255 &&&& \op >= -128)
+ .elseif (\op <= 255) && (\op >= -128)
  nonvcitermcb \op
  nonvcbwd bound,\op
- .elseif (\op <= 65535 &&&& \op >= -32767)
+ .elseif (\op <= 65535) && (\op >= -32767)
  nonvcitermcw \op
  nonvc2 bound.w,\op
  nonvc2 bound.d,\op