PowerPC: Merge rfc2655 and rfc2656 test cases into one future test case

gas/
	* testsuite/gas/ppc/rfc02655.[ds]: Rename from this...
	* testsuite/gas/ppc/future.[ds]: ... to this.
	* testsuite/gas/ppc/rfc02656.[ds]: Delete.  Move tests to future.[ds].
	* testsuite/gas/ppc/ppc.exp: Update for file name changes.

5 files changed, 18 insertions, 32 deletions

diff --git a/gas/testsuite/gas/ppc/rfc02656.d b/gas/testsuite/gas/ppc/future.d
index a24e135..8301132 100644
--- a/gas/testsuite/gas/ppc/rfc02656.d
+++ b/gas/testsuite/gas/ppc/future.d
@@ -1,6 +1,6 @@
 #as: -mfuture
 #objdump: -dr -Mfuture
-#name: RFC02656 tests
+#name: Future tests
 
 .*
 
@@ -8,6 +8,14 @@
 Disassembly of section \.text:
 
 0+0 <_start>:
+.*:	(90 58 4c 7d|7d 4c 58 90) 	subwus  r10,r11,r12
+.*:	(90 58 4c 7d|7d 4c 58 90) 	subwus  r10,r11,r12
+.*:	(91 58 4c 7d|7d 4c 58 91) 	subwus\. r10,r11,r12
+.*:	(91 58 4c 7d|7d 4c 58 91) 	subwus\. r10,r11,r12
+.*:	(90 ac 96 7e|7e 96 ac 90) 	subdus  r20,r21,r22
+.*:	(90 ac 96 7e|7e 96 ac 90) 	subdus  r20,r21,r22
+.*:	(91 ac 96 7e|7e 96 ac 91) 	subdus\. r20,r21,r22
+.*:	(91 ac 96 7e|7e 96 ac 91) 	subdus\. r20,r21,r22
 .*:	(1b 5c 4a 7c|7c 4a 5c 1b) 	lxvrl   vs34,r10,r11
 .*:	(5b 64 6a 7c|7c 6a 64 5b) 	lxvrll  vs35,r10,r12
 .*:	(9a 6c aa 7c|7c aa 6c 9a) 	lxvprl  vs36,r10,r13
diff --git a/gas/testsuite/gas/ppc/rfc02655.s b/gas/testsuite/gas/ppc/future.s
index b80c34e..fe2cc45 100644
--- a/gas/testsuite/gas/ppc/rfc02655.s
+++ b/gas/testsuite/gas/ppc/future.s
@@ -8,3 +8,11 @@ _start:
 	subdus	20,21,22
 	subfus.	20,1,22,21
 	subdus.	20,21,22
+	lxvrl	 34,10,11
+	lxvrll	 35,10,12
+	lxvprl	 36,10,13
+	lxvprll	 38,10,14
+	stxvrl	 40,10,15
+	stxvrll	 41,10,16
+	stxvprl	 40,10,17
+	stxvprll 42,10,18
diff --git a/gas/testsuite/gas/ppc/ppc.exp b/gas/testsuite/gas/ppc/ppc.exp
index 1d49396..1e1207c 100644
--- a/gas/testsuite/gas/ppc/ppc.exp
+++ b/gas/testsuite/gas/ppc/ppc.exp
@@ -147,9 +147,8 @@ run_dump_test "scalarquad"
 run_dump_test "rop"
 run_dump_test "rop-checks"
 run_dump_test "rfc02653"
-run_dump_test "rfc02655"
-run_dump_test "rfc02656"
 run_dump_test "rfc02658"
+run_dump_test "future"
 run_dump_test "future-raw"
 
 run_dump_test "dcbt"
diff --git a/gas/testsuite/gas/ppc/rfc02655.d b/gas/testsuite/gas/ppc/rfc02655.d
deleted file mode 100644
index 3a1d008..0000000
--- a/gas/testsuite/gas/ppc/rfc02655.d
+++ /dev/null
@@ -1,19 +0,0 @@
-#as: -mfuture
-#objdump: -dr -Mfuture
-#name: RFC02655 tests
-
-.*
-
-
-Disassembly of section \.text:
-
-0+0 <_start>:
-.*:	(90 58 4c 7d|7d 4c 58 90) 	subwus  r10,r11,r12
-.*:	(90 58 4c 7d|7d 4c 58 90) 	subwus  r10,r11,r12
-.*:	(91 58 4c 7d|7d 4c 58 91) 	subwus\. r10,r11,r12
-.*:	(91 58 4c 7d|7d 4c 58 91) 	subwus\. r10,r11,r12
-.*:	(90 ac 96 7e|7e 96 ac 90) 	subdus  r20,r21,r22
-.*:	(90 ac 96 7e|7e 96 ac 90) 	subdus  r20,r21,r22
-.*:	(91 ac 96 7e|7e 96 ac 91) 	subdus\. r20,r21,r22
-.*:	(91 ac 96 7e|7e 96 ac 91) 	subdus\. r20,r21,r22
-#pass
diff --git a/gas/testsuite/gas/ppc/rfc02656.s b/gas/testsuite/gas/ppc/rfc02656.s
deleted file mode 100644
index 55ed2a6..0000000
--- a/gas/testsuite/gas/ppc/rfc02656.s
+++ /dev/null
@@ -1,10 +0,0 @@
-	.text
-_start:
-	lxvrl	 34,10,11
-	lxvrll	 35,10,12
-	lxvprl	 36,10,13
-	lxvprll	 38,10,14
-	stxvrl	 40,10,15
-	stxvrll	 41,10,16
-	stxvprl	 40,10,17
-	stxvprll 42,10,18