S/390: Fix target attribute tests

These broke after removing G5 and G6 CPUs from the processor
enumeration.

gcc/testsuite/ChangeLog:

2018-08-09  Andreas Krebbel  <krebbel@linux.ibm.com>

	* gcc.target/s390/target-attribute/tattr-arch-tune-1.c: Decrement
	arch and tune numbers by 2.
	* gcc.target/s390/target-attribute/tattr-arch-tune-2.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-1.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-10.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-11.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-12.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-13.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-14.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-15.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-16.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-17.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-18.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-19.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-2.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-20.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-21.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-22.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-23.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-24.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-25.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-26.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-27.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-28.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-29.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-3.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-30.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-31.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-32.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-4.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-5.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-6.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-7.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-8.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m31-9.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-1.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-10.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-11.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-12.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-13.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-14.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-15.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-16.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-17.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-18.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-19.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-2.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-20.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-21.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-22.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-23.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-24.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-25.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-26.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-27.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-28.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-29.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-3.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-30.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-31.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-32.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-33.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-4.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-5.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-6.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-7.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-8.c: Likewise.
	* gcc.target/s390/target-attribute/tattr-m64-9.c: Likewise.

From-SVN: r263443

1 files changed, 32 insertions, 32 deletions

diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-26.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-26.c
index 1c11b6d..e4b49dc 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-26.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-26.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu7" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss2048" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc1" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("no-small-exec")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 se0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu7" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss2048" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc1" } } */
@@ -58,8 +58,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("small-exec")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 se1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu7" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss2048" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc1" } } */
@@ -79,8 +79,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("small-exec,no-small-exec")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 se0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu7" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss2048" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc1" } } */
@@ -98,8 +98,8 @@ void fn_att_1_0 (void) { }
 __attribute__ ((target ("no-small-exec,small-exec")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 se1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu7" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss2048" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc1" } } */
@@ -123,8 +123,8 @@ void fn_att_0_1 (void) { }
 #pragma GCC target ("no-small-exec")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 se0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss2048" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc1" } } */
@@ -141,8 +141,8 @@ void fn_pragma_0 (void) { }
 #pragma GCC reset_options
 
 void fn_pragma_0_default (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss2048" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc1" } } */
@@ -161,8 +161,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("small-exec")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 se1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss2048" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc1" } } */
@@ -179,8 +179,8 @@ void fn_pragma_1 (void) { }
 #pragma GCC reset_options
 
 void fn_pragma_1_default (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss2048" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc1" } } */
@@ -200,8 +200,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("no-small-exec")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 se0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss2048" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc1" } } */
@@ -221,8 +221,8 @@ void fn_pragma_1_0 (void) { }
 #pragma GCC target ("small-exec")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 se1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss2048" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc1" } } */
@@ -248,8 +248,8 @@ void fn_pragma_0_1 (void) { }
 __attribute__ ((target ("no-small-exec")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 se0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss2048" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc1" } } */
@@ -269,8 +269,8 @@ void fn_pragma_0_att_0 (void) { }
 __attribute__ ((target ("no-small-exec")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 se0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss2048" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc1" } } */
@@ -290,8 +290,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("small-exec")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 se1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss2048" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc1" } } */
@@ -311,8 +311,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("small-exec")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 se1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss2048" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc1" } } */
@@ -335,8 +335,8 @@ void fn_pragma_1_att_1 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu7" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss2048" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc1" } } */