* gas/m32r/relax-2.[sd]: New testcase.

	* gas/m32r/m32rx.exp: Run it.
PR 19068

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 26d6ac5815cac4136c9fba1470f05d2be9121366..6450b61c72d72bb9fb22f2de2c716313678cd9c6 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,4 +1,9 @@
-start-sanitize-m32rx
+start-sanitize-cygnus
+Fri Feb  5 19:53:52 1999  Doug Evans  <devans@canuck.cygnus.com>
+
+       * gas/m32r/relax-2.[sd]: New testcase.
+       * gas/m32r/m32rx.exp: Run it.
+
 Thu Feb  4 14:13:32 1999  Doug Evans  <devans@canuck.cygnus.com>
 
        * gas/m32r/outofrange.s: New testcase.
@@ -9,7 +14,7 @@ Thu Feb  4 14:13:32 1999  Doug Evans  <devans@canuck.cygnus.com>
        * gas/m32r/interfere.s: New testcase.
        * gas/m32r/error.exp: Run it.
 
-end-sanitize-m32rx
+end-sanitize-cygnus
 start-sanitize-r5900
 1999-01-06  Frank Ch. Eigler  <fche@cygnus.com>
 
@@ -98,14 +103,14 @@ Mon Nov  2 20:16:50 1998  Doug Evans  <devans@canuck.cygnus.com>
 
        * gas/m32r/fslot.[sd]: New testcase.
        * gas/m32r/m32r.exp: Run it.
-start-sanitize-m32rx
+start-sanitize-cygnus
        * gas/m32r/fslotx.[sd]: New testcase.
        * gas/m32r/m32rx.exp: Run it.
        * gas/m32r/m32rx.[sd]: Update.
 
        * gas/m32r/error.exp: New error testcase driver.
        * gas/m32r/wrongsize.s: New testcase.
-end-sanitize-m32rx
+end-sanitize-cygnus
 
 start-sanitize-r5900
 Fri Oct 23 13:01:24 EDT 1998 Frank Ch. Eigler <fche@cygnus.com>
@@ -164,13 +169,13 @@ Wed Aug 12 13:25:38 1998  Alan Modra  <alan@spri.levels.unisa.edu.au>
 
        * gas/i386/white.l: Expect warning for stand-alone ss prefix.
 
-start-sanitize-m32rx
+start-sanitize-cygnus
 Tue Jul 28 10:11:22 1998  Doug Evans  <devans@canuck.cygnus.com>
 
        * gas/m32r/m32rx.s: Test new insns.
        * gas/m32r/m32rx.d: Ditto.
 
-end-sanitize-m32rx
+end-sanitize-cygnus
 start-sanitize-cygnus
 Thu Jul 23 09:22:09 1998  Jeffrey A Law  (law@cygnus.com)
 
@@ -366,9 +371,9 @@ Fri May 22 15:56:51 1998  Doug Evans  <devans@canuck.cygnus.com>
 
        * gas/m32r/allinsn.d: Handle 64 bit bfd_vma.
        * gas/m32r/uppercase.d: Likewise.
-start-sanitize-m32rx
+start-sanitize-cygnus
        * gas/m32r/m32rx.d: Likewise.
-end-sanitize-m32rx
+end-sanitize-cygnus
 
 start-sanitize-sky
 Thu May 21 15:14:35 1998  Doug Evans  <devans@canuck.cygnus.com>
@@ -411,9 +416,9 @@ Fri May 15 14:51:01 1998  Gavin Koch  <gavin@cygnus.com>
 Wed May 13 15:06:31 1998  Doug Evans  <devans@canuck.cygnus.com>
 
        * gas/m32r/uppercase.[sd]: Test for HIGH,SHIGH,LOW,SDA.
-start-sanitize-m32rx
+start-sanitize-cygnus
        * gas/m32r/m32rx.d: Pass --enable-special to gas.
-end-sanitize-m32rx
+end-sanitize-cygnus
 
 start-sanitize-sky
 Mon May 11 13:04:58 1998  Frank Ch. Eigler  <fche@cygnus.com>
@@ -479,7 +484,7 @@ Fri Apr  3 12:19:33 1998  Doug Evans  <devans@canuck.cygnus.com>
        * gas/dvp/dvp.exp: Run it.
 
 end-sanitize-sky
-start-sanitize-m32rx
+start-sanitize-cygnus
 Thu Apr  2 16:49:29 1998  Nick Clifton  <nickc@cygnus.com>
 
        * gas/m32r/m32rx.d: Fix SATB and SAT bit patterns.
@@ -493,7 +498,7 @@ Sun Mar 29 13:05:41 1998  Nick Clifton  <nickc@cygnus.com>
 
        * gas/m32r/m32rx.d: Fix expected results for parallel lock.
 
-end-sanitize-m32rx
+end-sanitize-cygnus
 start-sanitize-sky
 Wed Mar 25 14:27:46 1998  Doug Evans  <devans@canuck.cygnus.com>
 
@@ -516,12 +521,12 @@ Mon Mar 23 13:26:12 1998  Doug Evans  <devans@canuck.cygnus.com>
        * gas/dvp/dvp.exp: Run new test mpg-1.s.
 
 end-sanitize-sky
-start-sanitize-m32rx
+start-sanitize-cygnus
 Mon Mar 23 11:34:00 1998  Nick Clifton  <nickc@cygnus.com>
 
        * gas/m32r/m32rx.d: Fix sath bit pattern (PR15418).
 
-end-sanitize-m32rx
+end-sanitize-cygnus
 Mon Mar 23 10:47:33 1998  Frank Ch. Eigler  <fche@cygnus.com>
 
        * gas/all/align.s: Back out ".section text" change below;
@@ -607,13 +612,13 @@ Fri Feb 20 01:29:16 1998  Jeffrey A Law  (law@cygnus.com)
        * gas/mips/r5900.s, gas/mips/r5900.d: Update for "mula.s" change.
 
 end-sanitize-r5900
-start-sanitize-m32rx
+start-sanitize-cygnus
 Thu Feb 19 10:35:48 1998  Nick Clifton  <nickc@cygnus.com>
 
        * gas/m32r/m32rx.s (mvtc__subv): Avoid register conflict.
 
        * gas/m32r/m32rx.d: Updated to match latest assembler output.
-end-sanitize-m32rx
+end-sanitize-cygnus
 start-sanitize-sky
 Tue Feb 17 18:44:12 1998  Doug Evans  <devans@canuck.cygnus.com>
 
@@ -621,13 +626,13 @@ Tue Feb 17 18:44:12 1998  Doug Evans  <devans@canuck.cygnus.com>
        spec on operands.
 
 end-sanitize-sky
-start-sanitize-m32rx
+start-sanitize-cygnus
 Fri Feb 13 14:44:32 1998  Nick Clifton  <nickc@cygnus.com>
 
        * gas/m32r/m32rx.s (rte__subx): Do not perform RTE and SUBX in
        parallel since they both write to the C bit.
 
-end-sanitize-m32rx
+end-sanitize-cygnus
 start-sanitize-sky
 Thu Feb 12 17:42:39 1998  Doug Evans  <devans@canuck.cygnus.com>
 
@@ -651,12 +656,12 @@ Tue Feb 10 15:32:22 1998  Ian Carmichael  <iancarm@cygnus.com>
        * gas/dvp/{error.exp,bignum-1.[sd],bignum_d.s}: New files.
 
 end-sanitize-sky
-start-sanitize-m32rx
+start-sanitize-cygnus
 Mon Feb  9 17:19:05 1998  Nick Clifton  <nickc@cygnus.com>
 
        * gas/m32r/m32rx.s: Add tests for DIVH and new versions of RAC and
        RACH instructions.  Rename MACHL1 ro MACLH1.
-end-sanitize-m32rx
+end-sanitize-cygnus
 Wed Feb  4 15:27:44 1998  Nick Clifton  <nickc@cygnus.com>
 
        * gas/arm/arm7t.d: Update to match latest assembler output.
@@ -718,25 +723,25 @@ Tue Jan 27 05:35:02 1998  Richard Henderson  <rth@cygnus.com>
 
        * gas/m68k/mri_moveml.[sd]: New testcase.
 
-start-sanitize-m32rx
+start-sanitize-cygnus
 Fri Jan 23 10:30:29 1998  Nick Clifton  <nickc@cygnus.com>
 
        * gas/m32r/m32rx.s: Use 'label' as desitnation of branches.
        * gas/m32r/m32rx.d: Update to match latest disassembly.
 
-end-sanitize-m32rx
+end-sanitize-cygnus
 Thu Jan 22 17:29:07 1998  Nick Clifton  <nickc@cygnus.com>
 
        * gas/m32r/high-1.d: Add hash prefix to constants.
 
        * gas/m32r/allinsn.s: Add hash prefix to some constants.
        * gas/m32r/allinsn.d: Add hash prefix to constants.
-start-sanitize-m32rx
+start-sanitize-cygnus
        * gas/m32r/m32rx.s: Add tests for automatic parallelisation.
        * gas/m32r/m32rx.d: Add results of automatic parallelisation.
        * gas/m32r/relax-1.d: Add results of automatic parallelisation.
        * gas/m32r/uppercase.d: Add results of automatic parallelisation.
-end-sanitize-m32rx
+end-sanitize-cygnus
 
 Wed Jan 21 21:24:08 1998  Manfred Hollstein  <manfred@s-direktnet.de>
 
@@ -746,10 +751,10 @@ Wed Jan 14 17:49:22 1998  Nick Clifton  <nickc@cygnus.com>
 
        * gas/m32r/uppercase.d: Fix white space matching.
        * gas/m32r/relax-1.d: Fix white space matching.
-start-sanitize-m32rx   
+start-sanitize-cygnus  
        * gas/m32r/m32rx.d: Add expected results.
        * gas/m32r/m32rx.s: Correct typos in test cases.
-end-sanitize-m32rx     
+end-sanitize-cygnus    
 
 Wed Jan 14 15:44:32 1998  Jeffrey A Law  (law@cygnus.com)
 
@@ -768,12 +773,12 @@ Mon Dec 22 12:47:16 1997  Ian Lance Taylor  <ian@cygnus.com>
 end-sanitize-r5900
 Thu Dec 18 11:10:42 1997  Nick Clifton  <nickc@cygnus.com>
 
-start-sanitize-m32rx
+start-sanitize-cygnus
        * gas/m32r/m32rx.d: New file.
        * gas/m32r/m32rx.s: New file.
        * gas/m32r/m32rx.exp: New file.
 
-end-sanitize-m32rx
+end-sanitize-cygnus
        * gas/arm/inst.d: Updated to match latest disassembler changes.
 
        * gas/arm/arm7t.d: Updated to match latest disassembler changes.

diff --git a/gas/testsuite/gas/m32r/.Sanitize b/gas/testsuite/gas/m32r/.Sanitize
index da87ce6cd324d77eb9f48ea2813d400a07078c0b..402e625e6325d708f9ef0564f0e8bcd98c4bc22d 100644 (file)
--- a/gas/testsuite/gas/m32r/.Sanitize
+++ b/gas/testsuite/gas/m32r/.Sanitize
@@ -15,7 +15,7 @@
 
 Do-first:
 
-cygnus_files="fslotx.s fslotx.d m32rx.s m32rx.d m32rx.exp error.exp interfere.s wrongsize.s"
+cygnus_files="fslotx.s fslotx.d m32rx.s m32rx.d relax-2.s relax-2.d m32rx.exp error.exp interfere.s wrongsize.s"
 if ( echo $* | grep keep\-cygnus > /dev/null ) ; then
         keep_these_too="${cygnus_files} ${keep_these_too}"
 else

diff --git a/gas/testsuite/gas/m32r/relax-2.d b/gas/testsuite/gas/m32r/relax-2.d
new file mode 100644 (file)
index 0000000..9055efc
--- /dev/null
+++ b/gas/testsuite/gas/m32r/relax-2.d
@@ -0,0 +1,18 @@
+#as: --m32rx
+#objdump: -dr
+#name: relax-2
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+0+0 <label1>:
+   0:  fd 00 00 83     bnc 20c <label3>
+   4:  70 00 f0 00     nop || nop
+   8:  43 03 c2 02     addi r3,#3 || addi r2,#2
+
+0+0c <label2>:
+       ...
+
+0+020c <label3>:
+ 20c:  70 00 f0 00     nop || nop

diff --git a/gas/testsuite/gas/m32r/relax-2.s b/gas/testsuite/gas/m32r/relax-2.s
new file mode 100644 (file)
index 0000000..179dec7
--- /dev/null
+++ b/gas/testsuite/gas/m32r/relax-2.s
@@ -0,0 +1,11 @@
+; Test whether parallel insns get inappropriately moved during relaxation.
+
+        .text
+label1:
+        bnc     label3
+        nop
+        addi    r3, #3 || addi  r2, #2
+label2:
+        .space 512
+label3:
+        nop