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

68 files changed, 2187 insertions, 2116 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 592e3ec..72d1c24 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,76 @@
 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.
+
+2018-08-09  Andreas Krebbel  <krebbel@linux.ibm.com>
+
 	PR target/84332
 	* gcc.target/s390/pr84332.c: New testcase.
 
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-arch-tune-1.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-arch-tune-1.c
index ded0885..f1fdaa4 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-arch-tune-1.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-arch-tune-1.c
@@ -8,28 +8,28 @@
  **/
 
 void fn_p0_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_p0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_p0_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_p0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_p0_1 tu7" } } */
 
 __attribute__ ((target("arch=zEC12")))
 void fn_p0_2 (void) { }
-/* { dg-final { scan-assembler "fn:fn_p0_2 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_p0_2 tu8" } } */
+/* { dg-final { scan-assembler "fn:fn_p0_2 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_p0_2 tu6" } } */
 
 __attribute__ ((target("tune=z196")))
 void fn_p0_3 (void) { }
-/* { dg-final { scan-assembler "fn:fn_p0_3 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_p0_3 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_p0_3 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_p0_3 tu5" } } */
 
 __attribute__ ((target("arch=zEC12,tune=z196")))
 void fn_p0_4 (void) { }
-/* { dg-final { scan-assembler "fn:fn_p0_4 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_p0_4 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_p0_4 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_p0_4 tu5" } } */
 
 __attribute__ ((target("tune=z196,arch=zEC12")))
 void fn_p0_5 (void) { }
-/* { dg-final { scan-assembler "fn:fn_p0_5 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_p0_5 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_p0_5 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_p0_5 tu5" } } */
 
 /**
  ** arch pragma
@@ -38,28 +38,28 @@ void fn_p0_5 (void) { }
 #pragma GCC target ("arch=z9-ec")
 
 void fn_pa_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pa_1 ar5" } } */
-/* { dg-final { scan-assembler "fn:fn_pa_1 tu5" } } */
+/* { dg-final { scan-assembler "fn:fn_pa_1 ar3" } } */
+/* { dg-final { scan-assembler "fn:fn_pa_1 tu3" } } */
 
 __attribute__ ((target("arch=zEC12")))
 void fn_pa_2 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pa_2 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pa_2 tu8" } } */
+/* { dg-final { scan-assembler "fn:fn_pa_2 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pa_2 tu6" } } */
 
 __attribute__ ((target("tune=z196")))
 void fn_pa_3 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pa_3 ar5" } } */
-/* { dg-final { scan-assembler "fn:fn_pa_3 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pa_3 ar3" } } */
+/* { dg-final { scan-assembler "fn:fn_pa_3 tu5" } } */
 
 __attribute__ ((target("arch=zEC12,tune=z196")))
 void fn_pa_4 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pa_4 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pa_4 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pa_4 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pa_4 tu5" } } */
 
 __attribute__ ((target("tune=z196,arch=zEC12")))
 void fn_pa_5 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pa_5 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pa_5 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pa_5 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pa_5 tu5" } } */
 
 #pragma GCC reset_options
 
@@ -70,28 +70,28 @@ void fn_pa_5 (void) { }
 #pragma GCC target ("tune=z9-109")
 
 void fn_pt_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pt_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pt_1 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pt_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pt_1 tu2" } } */
 
 __attribute__ ((target("arch=zEC12")))
 void fn_pt_2 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pt_2 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pt_2 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pt_2 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pt_2 tu2" } } */
 
 __attribute__ ((target("tune=z196")))
 void fn_pt_3 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pt_3 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pt_3 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pt_3 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pt_3 tu5" } } */
 
 __attribute__ ((target("arch=zEC12,tune=z196")))
 void fn_pt_4 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pt_4 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pt_4 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pt_4 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pt_4 tu5" } } */
 
 __attribute__ ((target("tune=z196,arch=zEC12")))
 void fn_pt_5 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pt_5 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pt_5 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pt_5 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pt_5 tu5" } } */
 
 #pragma GCC reset_options
 
@@ -102,28 +102,28 @@ void fn_pt_5 (void) { }
 #pragma GCC target ("arch=z9-ec,tune=z9-109")
 
 void fn_pat_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pat_1 ar5" } } */
-/* { dg-final { scan-assembler "fn:fn_pat_1 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pat_1 ar3" } } */
+/* { dg-final { scan-assembler "fn:fn_pat_1 tu2" } } */
 
 __attribute__ ((target("arch=zEC12")))
 void fn_pat_2 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pat_2 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pat_2 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pat_2 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pat_2 tu2" } } */
 
 __attribute__ ((target("tune=z196")))
 void fn_pat_3 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pat_3 ar5" } } */
-/* { dg-final { scan-assembler "fn:fn_pat_3 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pat_3 ar3" } } */
+/* { dg-final { scan-assembler "fn:fn_pat_3 tu5" } } */
 
 __attribute__ ((target("arch=zEC12,tune=z196")))
 void fn_pat_4 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pat_4 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pat_4 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pat_4 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pat_4 tu5" } } */
 
 __attribute__ ((target("tune=z196,arch=zEC12")))
 void fn_pat_5 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pat_5 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pat_5 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pat_5 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pat_5 tu5" } } */
 
 #pragma GCC reset_options
 
@@ -134,27 +134,27 @@ void fn_pat_5 (void) { }
 #pragma GCC target ("tune=z9-109,arch=z9-ec")
 
 void fn_pta_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pta_1 ar5" } } */
-/* { dg-final { scan-assembler "fn:fn_pta_1 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pta_1 ar3" } } */
+/* { dg-final { scan-assembler "fn:fn_pta_1 tu2" } } */
 
 __attribute__ ((target("arch=zEC12")))
 void fn_pta_2 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pta_2 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pta_2 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pta_2 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pta_2 tu2" } } */
 
 __attribute__ ((target("tune=z196")))
 void fn_pta_3 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pta_3 ar5" } } */
-/* { dg-final { scan-assembler "fn:fn_pta_3 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pta_3 ar3" } } */
+/* { dg-final { scan-assembler "fn:fn_pta_3 tu5" } } */
 
 __attribute__ ((target("arch=zEC12,tune=z196")))
 void fn_pta_4 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pta_4 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pta_4 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pta_4 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pta_4 tu5" } } */
 
 __attribute__ ((target("tune=z196,arch=zEC12")))
 void fn_pta_5 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pta_5 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pta_5 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pta_5 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pta_5 tu5" } } */
 
 #pragma GCC reset_options
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-arch-tune-2.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-arch-tune-2.c
index d21a522..ccdb98a 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-arch-tune-2.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-arch-tune-2.c
@@ -8,28 +8,28 @@
  **/
 
 void fn_p0_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_p0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_p0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_p0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_p0_1 tu4" } } */
 
 __attribute__ ((target("arch=zEC12")))
 void fn_p0_2 (void) { }
-/* { dg-final { scan-assembler "fn:fn_p0_2 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_p0_2 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_p0_2 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_p0_2 tu4" } } */
 
 __attribute__ ((target("tune=z196")))
 void fn_p0_3 (void) { }
-/* { dg-final { scan-assembler "fn:fn_p0_3 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_p0_3 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_p0_3 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_p0_3 tu5" } } */
 
 __attribute__ ((target("arch=zEC12,tune=z196")))
 void fn_p0_4 (void) { }
-/* { dg-final { scan-assembler "fn:fn_p0_4 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_p0_4 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_p0_4 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_p0_4 tu5" } } */
 
 __attribute__ ((target("tune=z196,arch=zEC12")))
 void fn_p0_5 (void) { }
-/* { dg-final { scan-assembler "fn:fn_p0_5 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_p0_5 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_p0_5 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_p0_5 tu5" } } */
 
 /**
  ** arch pragma
@@ -38,28 +38,28 @@ void fn_p0_5 (void) { }
 #pragma GCC target ("arch=z9-ec")
 
 void fn_pa_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pa_1 ar5" } } */
-/* { dg-final { scan-assembler "fn:fn_pa_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pa_1 ar3" } } */
+/* { dg-final { scan-assembler "fn:fn_pa_1 tu4" } } */
 
 __attribute__ ((target("arch=zEC12")))
 void fn_pa_2 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pa_2 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pa_2 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pa_2 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pa_2 tu4" } } */
 
 __attribute__ ((target("tune=z196")))
 void fn_pa_3 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pa_3 ar5" } } */
-/* { dg-final { scan-assembler "fn:fn_pa_3 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pa_3 ar3" } } */
+/* { dg-final { scan-assembler "fn:fn_pa_3 tu5" } } */
 
 __attribute__ ((target("arch=zEC12,tune=z196")))
 void fn_pa_4 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pa_4 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pa_4 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pa_4 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pa_4 tu5" } } */
 
 __attribute__ ((target("tune=z196,arch=zEC12")))
 void fn_pa_5 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pa_5 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pa_5 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pa_5 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pa_5 tu5" } } */
 
 #pragma GCC reset_options
 
@@ -70,28 +70,28 @@ void fn_pa_5 (void) { }
 #pragma GCC target ("tune=z9-109")
 
 void fn_pt_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pt_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pt_1 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pt_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pt_1 tu2" } } */
 
 __attribute__ ((target("arch=zEC12")))
 void fn_pt_2 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pt_2 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pt_2 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pt_2 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pt_2 tu2" } } */
 
 __attribute__ ((target("tune=z196")))
 void fn_pt_3 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pt_3 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pt_3 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pt_3 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pt_3 tu5" } } */
 
 __attribute__ ((target("arch=zEC12,tune=z196")))
 void fn_pt_4 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pt_4 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pt_4 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pt_4 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pt_4 tu5" } } */
 
 __attribute__ ((target("tune=z196,arch=zEC12")))
 void fn_pt_5 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pt_5 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pt_5 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pt_5 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pt_5 tu5" } } */
 
 #pragma GCC reset_options
 
@@ -102,28 +102,28 @@ void fn_pt_5 (void) { }
 #pragma GCC target ("arch=z9-ec,tune=z9-109")
 
 void fn_pat_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pat_1 ar5" } } */
-/* { dg-final { scan-assembler "fn:fn_pat_1 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pat_1 ar3" } } */
+/* { dg-final { scan-assembler "fn:fn_pat_1 tu2" } } */
 
 __attribute__ ((target("arch=zEC12")))
 void fn_pat_2 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pat_2 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pat_2 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pat_2 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pat_2 tu2" } } */
 
 __attribute__ ((target("tune=z196")))
 void fn_pat_3 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pat_3 ar5" } } */
-/* { dg-final { scan-assembler "fn:fn_pat_3 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pat_3 ar3" } } */
+/* { dg-final { scan-assembler "fn:fn_pat_3 tu5" } } */
 
 __attribute__ ((target("arch=zEC12,tune=z196")))
 void fn_pat_4 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pat_4 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pat_4 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pat_4 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pat_4 tu5" } } */
 
 __attribute__ ((target("tune=z196,arch=zEC12")))
 void fn_pat_5 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pat_5 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pat_5 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pat_5 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pat_5 tu5" } } */
 
 #pragma GCC reset_options
 
@@ -134,27 +134,27 @@ void fn_pat_5 (void) { }
 #pragma GCC target ("tune=z9-109,arch=z9-ec")
 
 void fn_pta_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pta_1 ar5" } } */
-/* { dg-final { scan-assembler "fn:fn_pta_1 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pta_1 ar3" } } */
+/* { dg-final { scan-assembler "fn:fn_pta_1 tu2" } } */
 
 __attribute__ ((target("arch=zEC12")))
 void fn_pta_2 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pta_2 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pta_2 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pta_2 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pta_2 tu2" } } */
 
 __attribute__ ((target("tune=z196")))
 void fn_pta_3 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pta_3 ar5" } } */
-/* { dg-final { scan-assembler "fn:fn_pta_3 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pta_3 ar3" } } */
+/* { dg-final { scan-assembler "fn:fn_pta_3 tu5" } } */
 
 __attribute__ ((target("arch=zEC12,tune=z196")))
 void fn_pta_4 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pta_4 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pta_4 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pta_4 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pta_4 tu5" } } */
 
 __attribute__ ((target("tune=z196,arch=zEC12")))
 void fn_pta_5 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pta_5 ar8" } } */
-/* { dg-final { scan-assembler "fn:fn_pta_5 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pta_5 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pta_5 tu5" } } */
 
 #pragma GCC reset_options
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-1.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-1.c
index 2dbb462..3247fff 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-1.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-1.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -36,8 +36,8 @@ void fn_default_start (void) { }
 
 __attribute__ ((target ("arch=z13")))
 void fn_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -57,8 +57,8 @@ void fn_att_1_default (void) { }
 
 __attribute__ ((target ("arch=z10")))
 void fn_att_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -78,8 +78,8 @@ void fn_att_0_default (void) { }
 
 __attribute__ ((target ("arch=z10,arch=z13")))
 void fn_att_0_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -97,8 +97,8 @@ void fn_att_0_1 (void) { }
 
 __attribute__ ((target ("arch=z13,arch=z10")))
 void fn_att_1_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -122,8 +122,8 @@ void fn_att_1_0 (void) { }
 
 #pragma GCC target ("arch=z13")
 void fn_pragma_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -160,8 +160,8 @@ void fn_pragma_1_default (void) { }
 
 #pragma GCC target ("arch=z10")
 void fn_pragma_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -199,8 +199,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("arch=z10")
 #pragma GCC target ("arch=z13")
 void fn_pragma_0_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -220,8 +220,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("arch=z13")
 #pragma GCC target ("arch=z10")
 void fn_pragma_1_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -247,8 +247,8 @@ void fn_pragma_1_0 (void) { }
 #pragma GCC target ("arch=z13")
 __attribute__ ((target ("arch=z13")))
 void fn_pragma_1_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -268,8 +268,8 @@ void fn_pragma_1_att_1 (void) { }
 #pragma GCC target ("arch=z13")
 __attribute__ ((target ("arch=z13")))
 void fn_pragma_0_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -289,8 +289,8 @@ void fn_pragma_0_att_1 (void) { }
 #pragma GCC target ("arch=z13")
 __attribute__ ((target ("arch=z10")))
 void fn_pragma_1_att_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -310,8 +310,8 @@ void fn_pragma_1_att_0 (void) { }
 #pragma GCC target ("arch=z13")
 __attribute__ ((target ("arch=z10")))
 void fn_pragma_0_att_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-10.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-10.c
index edae1ef..f1beb1d 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-10.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-10.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 ("branch-cost=1")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 bc1" } } */
-/* { 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 wf512" } } */
@@ -58,8 +58,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("branch-cost=2")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
-/* { 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 wf512" } } */
@@ -79,8 +79,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("branch-cost=2,branch-cost=1")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc1" } } */
-/* { 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 wf512" } } */
@@ -98,8 +98,8 @@ void fn_att_1_0 (void) { }
 __attribute__ ((target ("branch-cost=1,branch-cost=2")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
-/* { 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 wf512" } } */
@@ -123,8 +123,8 @@ void fn_att_0_1 (void) { }
 #pragma GCC target ("branch-cost=1")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc1" } } */
-/* { 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 wf512" } } */
@@ -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 ("branch-cost=2")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
-/* { 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 wf512" } } */
@@ -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 ("branch-cost=1")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc1" } } */
-/* { 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 wf512" } } */
@@ -221,8 +221,8 @@ void fn_pragma_1_0 (void) { }
 #pragma GCC target ("branch-cost=2")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
-/* { 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 wf512" } } */
@@ -248,8 +248,8 @@ void fn_pragma_0_1 (void) { }
 __attribute__ ((target ("branch-cost=1")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc1" } } */
-/* { 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 wf512" } } */
@@ -269,8 +269,8 @@ void fn_pragma_0_att_0 (void) { }
 __attribute__ ((target ("branch-cost=1")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc1" } } */
-/* { 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 wf512" } } */
@@ -290,8 +290,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("branch-cost=2")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
-/* { 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 wf512" } } */
@@ -311,8 +311,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("branch-cost=2")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
-/* { 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 wf512" } } */
@@ -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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-11.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-11.c
index 4b66d73..d459eec 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-11.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-11.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("warn-framesize=512")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 wf512" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("warn-framesize=0")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 wf0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("warn-framesize=0,warn-framesize=512")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 wf512" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("warn-framesize=512,warn-framesize=0")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 wf0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("warn-framesize=512")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 wf512" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("warn-framesize=0")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 wf0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("warn-framesize=512")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 wf512" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("warn-framesize=0")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 wf0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("warn-framesize=512")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 wf512" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("warn-framesize=512")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 wf512" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("warn-framesize=0")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 wf0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("warn-framesize=0")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 wf0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-12.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-12.c
index 515f504..8868f91 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-12.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-12.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 ("warn-framesize=0")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 wf0" } } */
-/* { 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 ("warn-framesize=512")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 wf512" } } */
-/* { 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 ("warn-framesize=512,warn-framesize=0")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 wf0" } } */
-/* { 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 ("warn-framesize=0,warn-framesize=512")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 wf512" } } */
-/* { 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 ("warn-framesize=0")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 wf0" } } */
-/* { 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 ("warn-framesize=512")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 wf512" } } */
-/* { 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 ("warn-framesize=0")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 wf0" } } */
-/* { 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 ("warn-framesize=512")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 wf512" } } */
-/* { 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 ("warn-framesize=0")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 wf0" } } */
-/* { 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 ("warn-framesize=0")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 wf0" } } */
-/* { 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 ("warn-framesize=512")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 wf512" } } */
-/* { 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 ("warn-framesize=512")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 wf512" } } */
-/* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-13.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-13.c
index ef0914e..6e2c5e4 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-13.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-13.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("backchain")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 ba1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("no-backchain")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 ba0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("no-backchain,backchain")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ba1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("backchain,no-backchain")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ba0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("backchain")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ba1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("no-backchain")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ba0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("backchain")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ba1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("no-backchain")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ba0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("backchain")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ba1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("backchain")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ba1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("no-backchain")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ba0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("no-backchain")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ba0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-14.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-14.c
index 7a7cb36..f928bef 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-14.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-14.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-backchain")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 ba0" } } */
-/* { 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 ("backchain")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 ba1" } } */
-/* { 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 ("backchain,no-backchain")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ba0" } } */
-/* { 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-backchain,backchain")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ba1" } } */
-/* { 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-backchain")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ba0" } } */
-/* { 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 ("backchain")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ba1" } } */
-/* { 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-backchain")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ba0" } } */
-/* { 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 ("backchain")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ba1" } } */
-/* { 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-backchain")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ba0" } } */
-/* { 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-backchain")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ba0" } } */
-/* { 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 ("backchain")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ba1" } } */
-/* { 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 ("backchain")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ba1" } } */
-/* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-15.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-15.c
index e1987c0..de9d79d 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-15.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-15.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("hard-dfp")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 hd1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("no-hard-dfp")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 hd0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("no-hard-dfp,hard-dfp")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 hd1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("hard-dfp,no-hard-dfp")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 hd0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("hard-dfp")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 hd1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("no-hard-dfp")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 hd0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("hard-dfp")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 hd1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("no-hard-dfp")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 hd0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("hard-dfp")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 hd1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("hard-dfp")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 hd1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("no-hard-dfp")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 hd0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("no-hard-dfp")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 hd0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-16.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-16.c
index b99a5f3..3a893fb 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-16.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-16.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-hard-dfp")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 hd0" } } */
-/* { 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 ("hard-dfp")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 hd1" } } */
-/* { 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 ("hard-dfp,no-hard-dfp")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 hd0" } } */
-/* { 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-hard-dfp,hard-dfp")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 hd1" } } */
-/* { 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-hard-dfp")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 hd0" } } */
-/* { 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 ("hard-dfp")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 hd1" } } */
-/* { 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-hard-dfp")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 hd0" } } */
-/* { 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 ("hard-dfp")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 hd1" } } */
-/* { 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-hard-dfp")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 hd0" } } */
-/* { 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-hard-dfp")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 hd0" } } */
-/* { 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 ("hard-dfp")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 hd1" } } */
-/* { 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 ("hard-dfp")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 hd1" } } */
-/* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-17.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-17.c
index 73e0228..5cd0810 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-17.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-17.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("hard-float")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 hf1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("soft-float")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 hf0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("soft-float,hard-float")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 hf1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("hard-float,soft-float")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 hf0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("hard-float")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 hf1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("soft-float")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 hf0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("hard-float")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 hf1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("soft-float")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 hf0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("hard-float")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 hf1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("hard-float")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 hf1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("soft-float")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 hf0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("soft-float")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 hf0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-18.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-18.c
index 63407a0..878f002 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-18.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-18.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 ("soft-float")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 hf0" } } */
-/* { 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 ("hard-float")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 hf1" } } */
-/* { 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 ("hard-float,soft-float")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 hf0" } } */
-/* { 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 ("soft-float,hard-float")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 hf1" } } */
-/* { 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 ("soft-float")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 hf0" } } */
-/* { 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 ("hard-float")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 hf1" } } */
-/* { 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 ("soft-float")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 hf0" } } */
-/* { 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 ("hard-float")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 hf1" } } */
-/* { 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 ("soft-float")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 hf0" } } */
-/* { 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 ("soft-float")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 hf0" } } */
-/* { 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 ("hard-float")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 hf1" } } */
-/* { 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 ("hard-float")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 hf1" } } */
-/* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-19.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-19.c
index b0ace81..918f26a 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-19.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-19.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("htm")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 ht1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("no-htm")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 ht0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("no-htm,htm")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ht1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("htm,no-htm")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ht0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("htm")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ht1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("no-htm")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ht0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("htm")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ht1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("no-htm")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ht0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("htm")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ht1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("htm")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ht1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("no-htm")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ht0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("no-htm")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ht0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-2.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-2.c
index 1e6713f..c663b9e 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-2.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-2.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" } } */
@@ -36,8 +36,8 @@ void fn_default_start (void) { }
 
 __attribute__ ((target ("arch=z10")))
 void fn_att_0 (void) { }
-/* { 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" } } */
@@ -57,8 +57,8 @@ void fn_att_0_default (void) { }
 
 __attribute__ ((target ("arch=z13")))
 void fn_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { 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" } } */
@@ -78,8 +78,8 @@ void fn_att_1_default (void) { }
 
 __attribute__ ((target ("arch=z13,arch=z10")))
 void fn_att_1_0 (void) { }
-/* { 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" } } */
@@ -97,8 +97,8 @@ void fn_att_1_0 (void) { }
 
 __attribute__ ((target ("arch=z10,arch=z13")))
 void fn_att_0_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { 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" } } */
@@ -122,8 +122,8 @@ void fn_att_0_1 (void) { }
 
 #pragma GCC target ("arch=z10")
 void fn_pragma_0 (void) { }
-/* { 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" } } */
@@ -160,8 +160,8 @@ void fn_pragma_0_default (void) { }
 
 #pragma GCC target ("arch=z13")
 void fn_pragma_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { 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" } } */
@@ -199,8 +199,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("arch=z13")
 #pragma GCC target ("arch=z10")
 void fn_pragma_1_0 (void) { }
-/* { 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" } } */
@@ -220,8 +220,8 @@ void fn_pragma_1_0 (void) { }
 #pragma GCC target ("arch=z10")
 #pragma GCC target ("arch=z13")
 void fn_pragma_0_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { 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" } } */
@@ -247,8 +247,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("arch=z10")
 __attribute__ ((target ("arch=z10")))
 void fn_pragma_0_att_0 (void) { }
-/* { 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" } } */
@@ -268,8 +268,8 @@ void fn_pragma_0_att_0 (void) { }
 #pragma GCC target ("arch=z10")
 __attribute__ ((target ("arch=z10")))
 void fn_pragma_1_att_0 (void) { }
-/* { 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" } } */
@@ -289,8 +289,8 @@ void fn_pragma_1_att_0 (void) { }
 #pragma GCC target ("arch=z10")
 __attribute__ ((target ("arch=z13")))
 void fn_pragma_0_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { 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" } } */
@@ -310,8 +310,8 @@ void fn_pragma_0_att_1 (void) { }
 #pragma GCC target ("arch=z10")
 __attribute__ ((target ("arch=z13")))
 void fn_pragma_1_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-20.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-20.c
index 48fa677..e9eacaa 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-20.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-20.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-htm")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 ht0" } } */
-/* { 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 ("htm")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 ht1" } } */
-/* { 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 ("htm,no-htm")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ht0" } } */
-/* { 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-htm,htm")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ht1" } } */
-/* { 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-htm")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ht0" } } */
-/* { 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 ("htm")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ht1" } } */
-/* { 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-htm")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ht0" } } */
-/* { 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 ("htm")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ht1" } } */
-/* { 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-htm")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ht0" } } */
-/* { 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-htm")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ht0" } } */
-/* { 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 ("htm")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ht1" } } */
-/* { 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 ("htm")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ht1" } } */
-/* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-21.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-21.c
index e8a2cba..64ff61a 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-21.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-21.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("vx")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("no-vx")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("no-vx,vx")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("vx,no-vx")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("vx")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("no-vx")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("vx")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("no-vx")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("vx")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("vx")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("no-vx")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("no-vx")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-22.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-22.c
index 53f7c11..1595475 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-22.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-22.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { 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-vx")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { 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 ("vx")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { 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 ("vx,no-vx")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { 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-vx,vx")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { 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-vx")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { 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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { 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 ("vx")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { 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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { 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-vx")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { 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 ("vx")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { 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-vx")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { 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-vx")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { 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 ("vx")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { 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 ("vx")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { 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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-23.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-23.c
index 79b0ac3..d8da7d7 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-23.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-23.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("packed-stack")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 ps1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("no-packed-stack")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 ps0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("no-packed-stack,packed-stack")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ps1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("packed-stack,no-packed-stack")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ps0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("packed-stack")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ps1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("no-packed-stack")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ps0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("packed-stack")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ps1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("no-packed-stack")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ps0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("packed-stack")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ps1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("packed-stack")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ps1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("no-packed-stack")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ps0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("no-packed-stack")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ps0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-24.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-24.c
index 8a7c6dc..87e4da5 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-24.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-24.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-packed-stack")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 ps0" } } */
-/* { 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 ("packed-stack")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 ps1" } } */
-/* { 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 ("packed-stack,no-packed-stack")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ps0" } } */
-/* { 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-packed-stack,packed-stack")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ps1" } } */
-/* { 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-packed-stack")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ps0" } } */
-/* { 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 ("packed-stack")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ps1" } } */
-/* { 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-packed-stack")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ps0" } } */
-/* { 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 ("packed-stack")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ps1" } } */
-/* { 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-packed-stack")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ps0" } } */
-/* { 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-packed-stack")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ps0" } } */
-/* { 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 ("packed-stack")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ps1" } } */
-/* { 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 ("packed-stack")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ps1" } } */
-/* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-25.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-25.c
index 926846b..19b238c 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-25.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-25.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-27.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-27.c
index d93c7d4..030ddae 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-27.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-27.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("mvcle")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 mv1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("no-mvcle")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 mv0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("no-mvcle,mvcle")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 mv1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("mvcle,no-mvcle")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 mv0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("mvcle")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 mv1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("no-mvcle")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 mv0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("mvcle")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 mv1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("no-mvcle")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 mv0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("mvcle")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 mv1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("mvcle")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 mv1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("no-mvcle")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 mv0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("no-mvcle")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 mv0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-28.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-28.c
index 7eb069a..ae784a6 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-28.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-28.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-mvcle")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 mv0" } } */
-/* { 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 ("mvcle")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 mv1" } } */
-/* { 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 ("mvcle,no-mvcle")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 mv0" } } */
-/* { 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-mvcle,mvcle")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 mv1" } } */
-/* { 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-mvcle")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 mv0" } } */
-/* { 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 ("mvcle")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 mv1" } } */
-/* { 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-mvcle")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 mv0" } } */
-/* { 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 ("mvcle")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 mv1" } } */
-/* { 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-mvcle")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 mv0" } } */
-/* { 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-mvcle")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 mv0" } } */
-/* { 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 ("mvcle")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 mv1" } } */
-/* { 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 ("mvcle")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 mv1" } } */
-/* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-29.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-29.c
index 2e38c6e..2a50e6a 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-29.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-29.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 #pragma GCC target ("zvector")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 zv1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -55,8 +55,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -75,8 +75,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("no-zvector")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 zv0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -93,8 +93,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -114,8 +114,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("zvector")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 zv1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -135,8 +135,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("no-zvector")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 zv0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -159,8 +159,8 @@ void fn_pragma_1_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-3.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-3.c
index 77739cc30..a2ee075 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-3.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-3.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -36,8 +36,8 @@ void fn_default_start (void) { }
 
 __attribute__ ((target ("tune=z13")))
 void fn_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -57,8 +57,8 @@ void fn_att_1_default (void) { }
 
 __attribute__ ((target ("tune=z10")))
 void fn_att_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -78,8 +78,8 @@ void fn_att_0_default (void) { }
 
 __attribute__ ((target ("tune=z10,tune=z13")))
 void fn_att_0_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -97,8 +97,8 @@ void fn_att_0_1 (void) { }
 
 __attribute__ ((target ("tune=z13,tune=z10")))
 void fn_att_1_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -122,8 +122,8 @@ void fn_att_1_0 (void) { }
 
 #pragma GCC target ("tune=z13")
 void fn_pragma_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -160,8 +160,8 @@ void fn_pragma_1_default (void) { }
 
 #pragma GCC target ("tune=z10")
 void fn_pragma_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -199,8 +199,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("tune=z10")
 #pragma GCC target ("tune=z13")
 void fn_pragma_0_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -220,8 +220,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("tune=z13")
 #pragma GCC target ("tune=z10")
 void fn_pragma_1_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -247,8 +247,8 @@ void fn_pragma_1_0 (void) { }
 #pragma GCC target ("tune=z13")
 __attribute__ ((target ("tune=z13")))
 void fn_pragma_1_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -268,8 +268,8 @@ void fn_pragma_1_att_1 (void) { }
 #pragma GCC target ("tune=z13")
 __attribute__ ((target ("tune=z13")))
 void fn_pragma_0_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -289,8 +289,8 @@ void fn_pragma_0_att_1 (void) { }
 #pragma GCC target ("tune=z13")
 __attribute__ ((target ("tune=z10")))
 void fn_pragma_1_att_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -310,8 +310,8 @@ void fn_pragma_1_att_0 (void) { }
 #pragma GCC target ("tune=z13")
 __attribute__ ((target ("tune=z10")))
 void fn_pragma_0_att_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-30.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-30.c
index cc882fe..f82d9ee 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-30.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-30.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) { }
 #pragma GCC target ("no-zvector")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 zv0" } } */
-/* { 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" } } */
@@ -55,8 +55,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" } } */
@@ -75,8 +75,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("zvector")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 zv1" } } */
-/* { 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" } } */
@@ -93,8 +93,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" } } */
@@ -114,8 +114,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("no-zvector")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 zv0" } } */
-/* { 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" } } */
@@ -135,8 +135,8 @@ void fn_pragma_1_0 (void) { }
 #pragma GCC target ("zvector")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 zv1" } } */
-/* { 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" } } */
@@ -159,8 +159,8 @@ void fn_pragma_0_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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-31.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-31.c
index 1b16c8e..77939aa 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-31.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-31.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("warn-dynamicstack")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 wd1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("no-warn-dynamicstack")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 wd0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("no-warn-dynamicstack,warn-dynamicstack")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 wd1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("warn-dynamicstack,no-warn-dynamicstack")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 wd0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("warn-dynamicstack")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 wd1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("no-warn-dynamicstack")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 wd0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("warn-dynamicstack")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 wd1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("no-warn-dynamicstack")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 wd0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("warn-dynamicstack")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 wd1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("warn-dynamicstack")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 wd1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("no-warn-dynamicstack")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 wd0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("no-warn-dynamicstack")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 wd0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-32.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-32.c
index cd0ef40..6bdc55a 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-32.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-32.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-warn-dynamicstack")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 wd0" } } */
-/* { 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 ("warn-dynamicstack")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 wd1" } } */
-/* { 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 ("warn-dynamicstack,no-warn-dynamicstack")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 wd0" } } */
-/* { 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-warn-dynamicstack,warn-dynamicstack")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 wd1" } } */
-/* { 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-warn-dynamicstack")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 wd0" } } */
-/* { 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 ("warn-dynamicstack")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 wd1" } } */
-/* { 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-warn-dynamicstack")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 wd0" } } */
-/* { 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 ("warn-dynamicstack")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 wd1" } } */
-/* { 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-warn-dynamicstack")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 wd0" } } */
-/* { 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-warn-dynamicstack")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 wd0" } } */
-/* { 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 ("warn-dynamicstack")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 wd1" } } */
-/* { 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 ("warn-dynamicstack")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 wd1" } } */
-/* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-4.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-4.c
index 163f722..5780f96 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-4.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-4.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" } } */
@@ -36,8 +36,8 @@ void fn_default_start (void) { }
 
 __attribute__ ((target ("tune=z10")))
 void fn_att_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar4" } } */
 /* { 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" } } */
@@ -57,8 +57,8 @@ void fn_att_0_default (void) { }
 
 __attribute__ ((target ("tune=z13")))
 void fn_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar4" } } */
 /* { 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" } } */
@@ -78,8 +78,8 @@ void fn_att_1_default (void) { }
 
 __attribute__ ((target ("tune=z13,tune=z10")))
 void fn_att_1_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar4" } } */
 /* { 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" } } */
@@ -97,8 +97,8 @@ void fn_att_1_0 (void) { }
 
 __attribute__ ((target ("tune=z10,tune=z13")))
 void fn_att_0_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar4" } } */
 /* { 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" } } */
@@ -122,8 +122,8 @@ void fn_att_0_1 (void) { }
 
 #pragma GCC target ("tune=z10")
 void fn_pragma_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar4" } } */
 /* { 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" } } */
@@ -160,8 +160,8 @@ void fn_pragma_0_default (void) { }
 
 #pragma GCC target ("tune=z13")
 void fn_pragma_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar4" } } */
 /* { 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" } } */
@@ -199,8 +199,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("tune=z13")
 #pragma GCC target ("tune=z10")
 void fn_pragma_1_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar4" } } */
 /* { 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" } } */
@@ -220,8 +220,8 @@ void fn_pragma_1_0 (void) { }
 #pragma GCC target ("tune=z10")
 #pragma GCC target ("tune=z13")
 void fn_pragma_0_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar4" } } */
 /* { 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" } } */
@@ -247,8 +247,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("tune=z10")
 __attribute__ ((target ("tune=z10")))
 void fn_pragma_0_att_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar4" } } */
 /* { 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" } } */
@@ -268,8 +268,8 @@ void fn_pragma_0_att_0 (void) { }
 #pragma GCC target ("tune=z10")
 __attribute__ ((target ("tune=z10")))
 void fn_pragma_1_att_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar4" } } */
 /* { 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" } } */
@@ -289,8 +289,8 @@ void fn_pragma_1_att_0 (void) { }
 #pragma GCC target ("tune=z10")
 __attribute__ ((target ("tune=z13")))
 void fn_pragma_0_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar4" } } */
 /* { 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" } } */
@@ -310,8 +310,8 @@ void fn_pragma_0_att_1 (void) { }
 #pragma GCC target ("tune=z10")
 __attribute__ ((target ("tune=z13")))
 void fn_pragma_1_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar4" } } */
 /* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-5.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-5.c
index 4ad1d08..15e7f22 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-5.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-5.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("stack-size=4096")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 wf0" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("stack-size=2048")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 ss2048" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 wf0" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("stack-size=2048,stack-size=4096")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 wf0" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("stack-size=4096,stack-size=2048")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss2048" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 wf0" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("stack-size=4096")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 wf0" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("stack-size=2048")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss2048" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 wf0" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("stack-size=4096")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 wf0" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("stack-size=2048")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss2048" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 wf0" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("stack-size=4096")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 wf0" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("stack-size=4096")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 wf0" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("stack-size=2048")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss2048" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 wf0" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("stack-size=2048")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss2048" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 wf0" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-6.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-6.c
index 58ca602..a946ff8 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-6.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-6.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 ("stack-size=2048")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 ss2048" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 wf512" } } */
@@ -58,8 +58,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("stack-size=4096")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 wf512" } } */
@@ -79,8 +79,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("stack-size=4096,stack-size=2048")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss2048" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 wf512" } } */
@@ -98,8 +98,8 @@ void fn_att_1_0 (void) { }
 __attribute__ ((target ("stack-size=2048,stack-size=4096")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 wf512" } } */
@@ -123,8 +123,8 @@ void fn_att_0_1 (void) { }
 #pragma GCC target ("stack-size=2048")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss2048" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 wf512" } } */
@@ -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 ("stack-size=4096")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 wf512" } } */
@@ -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 ("stack-size=2048")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss2048" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 wf512" } } */
@@ -221,8 +221,8 @@ void fn_pragma_1_0 (void) { }
 #pragma GCC target ("stack-size=4096")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 wf512" } } */
@@ -248,8 +248,8 @@ void fn_pragma_0_1 (void) { }
 __attribute__ ((target ("stack-size=2048")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss2048" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 wf512" } } */
@@ -269,8 +269,8 @@ void fn_pragma_0_att_0 (void) { }
 __attribute__ ((target ("stack-size=2048")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss2048" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 wf512" } } */
@@ -290,8 +290,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("stack-size=4096")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 wf512" } } */
@@ -311,8 +311,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("stack-size=4096")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 wf512" } } */
@@ -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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-7.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-7.c
index 2fc4c4f1..b929f675 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-7.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-7.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("stack-guard=16")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 sg16" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 wf0" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("stack-guard=0")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 wf0" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("stack-guard=0,stack-guard=16")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg16" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 wf0" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("stack-guard=16,stack-guard=0")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 wf0" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("stack-guard=16")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg16" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 wf0" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("stack-guard=0")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 wf0" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("stack-guard=16")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg16" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 wf0" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("stack-guard=0")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 wf0" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("stack-guard=16")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg16" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 wf0" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("stack-guard=16")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg16" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 wf0" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("stack-guard=0")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 wf0" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("stack-guard=0")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 wf0" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-8.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-8.c
index 1a4dcb7..fee9644 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-8.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-8.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 ("stack-guard=0")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 wf512" } } */
@@ -58,8 +58,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("stack-guard=16")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 sg16" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 wf512" } } */
@@ -79,8 +79,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("stack-guard=16,stack-guard=0")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 wf512" } } */
@@ -98,8 +98,8 @@ void fn_att_1_0 (void) { }
 __attribute__ ((target ("stack-guard=0,stack-guard=16")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg16" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 wf512" } } */
@@ -123,8 +123,8 @@ void fn_att_0_1 (void) { }
 #pragma GCC target ("stack-guard=0")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 wf512" } } */
@@ -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 ("stack-guard=16")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg16" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 wf512" } } */
@@ -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 ("stack-guard=0")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 wf512" } } */
@@ -221,8 +221,8 @@ void fn_pragma_1_0 (void) { }
 #pragma GCC target ("stack-guard=16")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg16" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 wf512" } } */
@@ -248,8 +248,8 @@ void fn_pragma_0_1 (void) { }
 __attribute__ ((target ("stack-guard=0")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 wf512" } } */
@@ -269,8 +269,8 @@ void fn_pragma_0_att_0 (void) { }
 __attribute__ ((target ("stack-guard=0")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 wf512" } } */
@@ -290,8 +290,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("stack-guard=16")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg16" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 wf512" } } */
@@ -311,8 +311,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("stack-guard=16")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg16" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 wf512" } } */
@@ -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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-9.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-9.c
index d4304f9..04741ef 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-9.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m31-9.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("branch-cost=2")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 wf0" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("branch-cost=1")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 bc1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 wf0" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("branch-cost=1,branch-cost=2")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 wf0" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("branch-cost=2,branch-cost=1")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 wf0" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("branch-cost=2")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 wf0" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("branch-cost=1")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 wf0" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("branch-cost=2")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 wf0" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("branch-cost=1")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 wf0" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("branch-cost=2")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 wf0" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("branch-cost=2")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 wf0" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("branch-cost=1")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 wf0" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("branch-cost=1")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 wf0" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-1.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-1.c
index 73003f0..41144a7 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-1.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-1.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -36,8 +36,8 @@ void fn_default_start (void) { }
 
 __attribute__ ((target ("arch=z13")))
 void fn_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -57,8 +57,8 @@ void fn_att_1_default (void) { }
 
 __attribute__ ((target ("arch=z10")))
 void fn_att_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -78,8 +78,8 @@ void fn_att_0_default (void) { }
 
 __attribute__ ((target ("arch=z10,arch=z13")))
 void fn_att_0_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -97,8 +97,8 @@ void fn_att_0_1 (void) { }
 
 __attribute__ ((target ("arch=z13,arch=z10")))
 void fn_att_1_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -122,8 +122,8 @@ void fn_att_1_0 (void) { }
 
 #pragma GCC target ("arch=z13")
 void fn_pragma_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -160,8 +160,8 @@ void fn_pragma_1_default (void) { }
 
 #pragma GCC target ("arch=z10")
 void fn_pragma_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -199,8 +199,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("arch=z10")
 #pragma GCC target ("arch=z13")
 void fn_pragma_0_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -220,8 +220,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("arch=z13")
 #pragma GCC target ("arch=z10")
 void fn_pragma_1_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -247,8 +247,8 @@ void fn_pragma_1_0 (void) { }
 #pragma GCC target ("arch=z13")
 __attribute__ ((target ("arch=z13")))
 void fn_pragma_1_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -268,8 +268,8 @@ void fn_pragma_1_att_1 (void) { }
 #pragma GCC target ("arch=z13")
 __attribute__ ((target ("arch=z13")))
 void fn_pragma_0_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -289,8 +289,8 @@ void fn_pragma_0_att_1 (void) { }
 #pragma GCC target ("arch=z13")
 __attribute__ ((target ("arch=z10")))
 void fn_pragma_1_att_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -310,8 +310,8 @@ void fn_pragma_1_att_0 (void) { }
 #pragma GCC target ("arch=z13")
 __attribute__ ((target ("arch=z10")))
 void fn_pragma_0_att_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-10.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-10.c
index 7d33c89..7071be2 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-10.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-10.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 ("branch-cost=1")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 bc1" } } */
-/* { 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 wf512" } } */
@@ -58,8 +58,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("branch-cost=2")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
-/* { 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 wf512" } } */
@@ -79,8 +79,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("branch-cost=2,branch-cost=1")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc1" } } */
-/* { 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 wf512" } } */
@@ -98,8 +98,8 @@ void fn_att_1_0 (void) { }
 __attribute__ ((target ("branch-cost=1,branch-cost=2")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
-/* { 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 wf512" } } */
@@ -123,8 +123,8 @@ void fn_att_0_1 (void) { }
 #pragma GCC target ("branch-cost=1")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc1" } } */
-/* { 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 wf512" } } */
@@ -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 ("branch-cost=2")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
-/* { 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 wf512" } } */
@@ -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 ("branch-cost=1")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc1" } } */
-/* { 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 wf512" } } */
@@ -221,8 +221,8 @@ void fn_pragma_1_0 (void) { }
 #pragma GCC target ("branch-cost=2")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
-/* { 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 wf512" } } */
@@ -248,8 +248,8 @@ void fn_pragma_0_1 (void) { }
 __attribute__ ((target ("branch-cost=1")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc1" } } */
-/* { 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 wf512" } } */
@@ -269,8 +269,8 @@ void fn_pragma_0_att_0 (void) { }
 __attribute__ ((target ("branch-cost=1")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc1" } } */
-/* { 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 wf512" } } */
@@ -290,8 +290,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("branch-cost=2")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
-/* { 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 wf512" } } */
@@ -311,8 +311,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("branch-cost=2")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
-/* { 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 wf512" } } */
@@ -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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-11.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-11.c
index 4737e9c..66537ce 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-11.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-11.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("warn-framesize=512")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 wf512" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("warn-framesize=0")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 wf0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("warn-framesize=0,warn-framesize=512")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 wf512" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("warn-framesize=512,warn-framesize=0")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 wf0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("warn-framesize=512")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 wf512" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("warn-framesize=0")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 wf0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("warn-framesize=512")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 wf512" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("warn-framesize=0")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 wf0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("warn-framesize=512")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 wf512" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("warn-framesize=512")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 wf512" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("warn-framesize=0")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 wf0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("warn-framesize=0")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 wf0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-12.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-12.c
index 71addb8..1bee25d 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-12.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-12.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 ("warn-framesize=0")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 wf0" } } */
-/* { 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 ("warn-framesize=512")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 wf512" } } */
-/* { 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 ("warn-framesize=512,warn-framesize=0")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 wf0" } } */
-/* { 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 ("warn-framesize=0,warn-framesize=512")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 wf512" } } */
-/* { 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 ("warn-framesize=0")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 wf0" } } */
-/* { 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 ("warn-framesize=512")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 wf512" } } */
-/* { 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 ("warn-framesize=0")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 wf0" } } */
-/* { 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 ("warn-framesize=512")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 wf512" } } */
-/* { 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 ("warn-framesize=0")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 wf0" } } */
-/* { 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 ("warn-framesize=0")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 wf0" } } */
-/* { 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 ("warn-framesize=512")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 wf512" } } */
-/* { 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 ("warn-framesize=512")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 wf512" } } */
-/* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-13.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-13.c
index 27e3ec5..8accc80 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-13.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-13.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("backchain")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 ba1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("no-backchain")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 ba0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("no-backchain,backchain")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ba1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("backchain,no-backchain")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ba0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("backchain")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ba1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("no-backchain")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ba0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("backchain")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ba1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("no-backchain")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ba0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("backchain")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ba1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("backchain")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ba1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("no-backchain")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ba0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("no-backchain")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ba0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-14.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-14.c
index 9eb0cc5..80cd6d4 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-14.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-14.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-backchain")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 ba0" } } */
-/* { 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 ("backchain")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 ba1" } } */
-/* { 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 ("backchain,no-backchain")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ba0" } } */
-/* { 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-backchain,backchain")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ba1" } } */
-/* { 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-backchain")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ba0" } } */
-/* { 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 ("backchain")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ba1" } } */
-/* { 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-backchain")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ba0" } } */
-/* { 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 ("backchain")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ba1" } } */
-/* { 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-backchain")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ba0" } } */
-/* { 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-backchain")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ba0" } } */
-/* { 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 ("backchain")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ba1" } } */
-/* { 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 ("backchain")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ba1" } } */
-/* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-15.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-15.c
index 3818ccd..b717eb2 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-15.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-15.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("hard-dfp")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 hd1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("no-hard-dfp")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 hd0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("no-hard-dfp,hard-dfp")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 hd1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("hard-dfp,no-hard-dfp")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 hd0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("hard-dfp")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 hd1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("no-hard-dfp")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 hd0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("hard-dfp")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 hd1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("no-hard-dfp")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 hd0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("hard-dfp")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 hd1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("hard-dfp")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 hd1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("no-hard-dfp")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 hd0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("no-hard-dfp")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 hd0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-16.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-16.c
index 1660029..52c7981 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-16.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-16.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-hard-dfp")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 hd0" } } */
-/* { 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 ("hard-dfp")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 hd1" } } */
-/* { 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 ("hard-dfp,no-hard-dfp")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 hd0" } } */
-/* { 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-hard-dfp,hard-dfp")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 hd1" } } */
-/* { 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-hard-dfp")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 hd0" } } */
-/* { 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 ("hard-dfp")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 hd1" } } */
-/* { 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-hard-dfp")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 hd0" } } */
-/* { 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 ("hard-dfp")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 hd1" } } */
-/* { 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-hard-dfp")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 hd0" } } */
-/* { 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-hard-dfp")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 hd0" } } */
-/* { 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 ("hard-dfp")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 hd1" } } */
-/* { 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 ("hard-dfp")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 hd1" } } */
-/* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-17.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-17.c
index 39e588d..6b21745 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-17.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-17.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("hard-float")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 hf1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("soft-float")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 hf0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("soft-float,hard-float")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 hf1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("hard-float,soft-float")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 hf0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("hard-float")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 hf1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("soft-float")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 hf0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("hard-float")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 hf1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("soft-float")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 hf0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("hard-float")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 hf1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("hard-float")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 hf1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("soft-float")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 hf0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("soft-float")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 hf0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-18.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-18.c
index 0b68242..d5ab735 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-18.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-18.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 ("soft-float")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 hf0" } } */
-/* { 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 ("hard-float")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 hf1" } } */
-/* { 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 ("hard-float,soft-float")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 hf0" } } */
-/* { 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 ("soft-float,hard-float")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 hf1" } } */
-/* { 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 ("soft-float")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 hf0" } } */
-/* { 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 ("hard-float")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 hf1" } } */
-/* { 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 ("soft-float")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 hf0" } } */
-/* { 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 ("hard-float")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 hf1" } } */
-/* { 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 ("soft-float")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 hf0" } } */
-/* { 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 ("soft-float")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 hf0" } } */
-/* { 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 ("hard-float")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 hf1" } } */
-/* { 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 ("hard-float")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 hf1" } } */
-/* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-19.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-19.c
index 4088002..2967bcb 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-19.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-19.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("htm")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 ht1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("no-htm")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 ht0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("no-htm,htm")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ht1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("htm,no-htm")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ht0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("htm")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ht1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("no-htm")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ht0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("htm")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ht1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("no-htm")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ht0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("htm")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ht1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("htm")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ht1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("no-htm")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ht0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("no-htm")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ht0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-2.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-2.c
index 55a86bf..e30c9c4 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-2.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-2.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" } } */
@@ -36,8 +36,8 @@ void fn_default_start (void) { }
 
 __attribute__ ((target ("arch=z10")))
 void fn_att_0 (void) { }
-/* { 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" } } */
@@ -57,8 +57,8 @@ void fn_att_0_default (void) { }
 
 __attribute__ ((target ("arch=z13")))
 void fn_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { 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" } } */
@@ -78,8 +78,8 @@ void fn_att_1_default (void) { }
 
 __attribute__ ((target ("arch=z13,arch=z10")))
 void fn_att_1_0 (void) { }
-/* { 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" } } */
@@ -97,8 +97,8 @@ void fn_att_1_0 (void) { }
 
 __attribute__ ((target ("arch=z10,arch=z13")))
 void fn_att_0_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { 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" } } */
@@ -122,8 +122,8 @@ void fn_att_0_1 (void) { }
 
 #pragma GCC target ("arch=z10")
 void fn_pragma_0 (void) { }
-/* { 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" } } */
@@ -160,8 +160,8 @@ void fn_pragma_0_default (void) { }
 
 #pragma GCC target ("arch=z13")
 void fn_pragma_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { 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" } } */
@@ -199,8 +199,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("arch=z13")
 #pragma GCC target ("arch=z10")
 void fn_pragma_1_0 (void) { }
-/* { 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" } } */
@@ -220,8 +220,8 @@ void fn_pragma_1_0 (void) { }
 #pragma GCC target ("arch=z10")
 #pragma GCC target ("arch=z13")
 void fn_pragma_0_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { 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" } } */
@@ -247,8 +247,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("arch=z10")
 __attribute__ ((target ("arch=z10")))
 void fn_pragma_0_att_0 (void) { }
-/* { 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" } } */
@@ -268,8 +268,8 @@ void fn_pragma_0_att_0 (void) { }
 #pragma GCC target ("arch=z10")
 __attribute__ ((target ("arch=z10")))
 void fn_pragma_1_att_0 (void) { }
-/* { 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" } } */
@@ -289,8 +289,8 @@ void fn_pragma_1_att_0 (void) { }
 #pragma GCC target ("arch=z10")
 __attribute__ ((target ("arch=z13")))
 void fn_pragma_0_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { 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" } } */
@@ -310,8 +310,8 @@ void fn_pragma_0_att_1 (void) { }
 #pragma GCC target ("arch=z10")
 __attribute__ ((target ("arch=z13")))
 void fn_pragma_1_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-20.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-20.c
index d2b6566..bea7732 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-20.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-20.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-htm")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 ht0" } } */
-/* { 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 ("htm")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 ht1" } } */
-/* { 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 ("htm,no-htm")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ht0" } } */
-/* { 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-htm,htm")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ht1" } } */
-/* { 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-htm")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ht0" } } */
-/* { 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 ("htm")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ht1" } } */
-/* { 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-htm")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ht0" } } */
-/* { 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 ("htm")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ht1" } } */
-/* { 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-htm")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ht0" } } */
-/* { 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-htm")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ht0" } } */
-/* { 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 ("htm")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ht1" } } */
-/* { 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 ("htm")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ht1" } } */
-/* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-21.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-21.c
index 441e6bc..414a794 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-21.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-21.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("vx")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("no-vx")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("no-vx,vx")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("vx,no-vx")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("vx")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("no-vx")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("vx")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("no-vx")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("vx")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("vx")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("no-vx")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("no-vx")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-22.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-22.c
index e954106..28fa01f 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-22.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-22.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { 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-vx")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { 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 ("vx")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { 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 ("vx,no-vx")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { 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-vx,vx")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { 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-vx")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { 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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { 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 ("vx")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { 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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { 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-vx")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { 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 ("vx")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { 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-vx")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { 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-vx")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 vx0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { 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 ("vx")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { 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 ("vx")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 vx1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { 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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu9" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-23.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-23.c
index 6e6b37a..19550ab 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-23.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-23.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("packed-stack")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 ps1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("no-packed-stack")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 ps0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("no-packed-stack,packed-stack")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ps1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("packed-stack,no-packed-stack")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ps0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("packed-stack")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ps1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("no-packed-stack")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ps0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("packed-stack")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ps1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("no-packed-stack")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ps0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("packed-stack")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ps1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("packed-stack")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ps1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("no-packed-stack")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ps0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("no-packed-stack")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ps0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-24.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-24.c
index b97454f..56d92b5 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-24.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-24.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-packed-stack")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 ps0" } } */
-/* { 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 ("packed-stack")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 ps1" } } */
-/* { 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 ("packed-stack,no-packed-stack")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ps0" } } */
-/* { 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-packed-stack,packed-stack")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ps1" } } */
-/* { 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-packed-stack")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ps0" } } */
-/* { 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 ("packed-stack")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ps1" } } */
-/* { 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-packed-stack")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ps0" } } */
-/* { 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 ("packed-stack")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ps1" } } */
-/* { 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-packed-stack")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ps0" } } */
-/* { 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-packed-stack")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ps0" } } */
-/* { 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 ("packed-stack")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ps1" } } */
-/* { 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 ("packed-stack")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ps1" } } */
-/* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-25.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-25.c
index 46c41cc..56ec1d4 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-25.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-25.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-26.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-26.c
index 957d658..70a8d4b 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-26.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-27.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-27.c
index 59b5812..d73faea 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-27.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-27.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("mvcle")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 mv1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("no-mvcle")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 mv0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("no-mvcle,mvcle")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 mv1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("mvcle,no-mvcle")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 mv0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("mvcle")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 mv1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("no-mvcle")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 mv0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("mvcle")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 mv1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("no-mvcle")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 mv0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("mvcle")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 mv1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("mvcle")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 mv1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("no-mvcle")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 mv0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("no-mvcle")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 mv0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-28.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-28.c
index 7720127..a5985f8 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-28.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-28.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-mvcle")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 mv0" } } */
-/* { 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 ("mvcle")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 mv1" } } */
-/* { 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 ("mvcle,no-mvcle")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 mv0" } } */
-/* { 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-mvcle,mvcle")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 mv1" } } */
-/* { 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-mvcle")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 mv0" } } */
-/* { 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 ("mvcle")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 mv1" } } */
-/* { 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-mvcle")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 mv0" } } */
-/* { 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 ("mvcle")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 mv1" } } */
-/* { 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-mvcle")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 mv0" } } */
-/* { 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-mvcle")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 mv0" } } */
-/* { 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 ("mvcle")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 mv1" } } */
-/* { 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 ("mvcle")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 mv1" } } */
-/* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-29.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-29.c
index c5bbfaf..db1f97a 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-29.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-29.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 #pragma GCC target ("zvector")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 zv1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -55,8 +55,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -75,8 +75,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("no-zvector")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 zv0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -93,8 +93,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -114,8 +114,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("zvector")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 zv1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -135,8 +135,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("no-zvector")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 zv0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -159,8 +159,8 @@ void fn_pragma_1_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-3.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-3.c
index 948da10..7edbe60 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-3.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-3.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -36,8 +36,8 @@ void fn_default_start (void) { }
 
 __attribute__ ((target ("tune=z13")))
 void fn_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -57,8 +57,8 @@ void fn_att_1_default (void) { }
 
 __attribute__ ((target ("tune=z10")))
 void fn_att_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -78,8 +78,8 @@ void fn_att_0_default (void) { }
 
 __attribute__ ((target ("tune=z10,tune=z13")))
 void fn_att_0_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -97,8 +97,8 @@ void fn_att_0_1 (void) { }
 
 __attribute__ ((target ("tune=z13,tune=z10")))
 void fn_att_1_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -122,8 +122,8 @@ void fn_att_1_0 (void) { }
 
 #pragma GCC target ("tune=z13")
 void fn_pragma_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -160,8 +160,8 @@ void fn_pragma_1_default (void) { }
 
 #pragma GCC target ("tune=z10")
 void fn_pragma_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -199,8 +199,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("tune=z10")
 #pragma GCC target ("tune=z13")
 void fn_pragma_0_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -220,8 +220,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("tune=z13")
 #pragma GCC target ("tune=z10")
 void fn_pragma_1_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -247,8 +247,8 @@ void fn_pragma_1_0 (void) { }
 #pragma GCC target ("tune=z13")
 __attribute__ ((target ("tune=z13")))
 void fn_pragma_1_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -268,8 +268,8 @@ void fn_pragma_1_att_1 (void) { }
 #pragma GCC target ("tune=z13")
 __attribute__ ((target ("tune=z13")))
 void fn_pragma_0_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -289,8 +289,8 @@ void fn_pragma_0_att_1 (void) { }
 #pragma GCC target ("tune=z13")
 __attribute__ ((target ("tune=z10")))
 void fn_pragma_1_att_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -310,8 +310,8 @@ void fn_pragma_1_att_0 (void) { }
 #pragma GCC target ("tune=z13")
 __attribute__ ((target ("tune=z10")))
 void fn_pragma_0_att_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-30.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-30.c
index 6aa813b..783a653 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-30.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-30.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) { }
 #pragma GCC target ("no-zvector")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 zv0" } } */
-/* { 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" } } */
@@ -55,8 +55,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" } } */
@@ -75,8 +75,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("zvector")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 zv1" } } */
-/* { 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" } } */
@@ -93,8 +93,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" } } */
@@ -114,8 +114,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("no-zvector")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 zv0" } } */
-/* { 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" } } */
@@ -135,8 +135,8 @@ void fn_pragma_1_0 (void) { }
 #pragma GCC target ("zvector")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 zv1" } } */
-/* { 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" } } */
@@ -159,8 +159,8 @@ void fn_pragma_0_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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-31.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-31.c
index 5227e9a..afb6bc1 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-31.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-31.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("warn-dynamicstack")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 wd1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("no-warn-dynamicstack")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 wd0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("no-warn-dynamicstack,warn-dynamicstack")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 wd1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("warn-dynamicstack,no-warn-dynamicstack")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 wd0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("warn-dynamicstack")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 wd1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("no-warn-dynamicstack")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 wd0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("warn-dynamicstack")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 wd1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("no-warn-dynamicstack")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 wd0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("warn-dynamicstack")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 wd1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("warn-dynamicstack")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 wd1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("no-warn-dynamicstack")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 wd0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("no-warn-dynamicstack")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 wd0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-32.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-32.c
index 5d9eef7..6793a4e 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-32.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-32.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-warn-dynamicstack")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 wd0" } } */
-/* { 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 ("warn-dynamicstack")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 wd1" } } */
-/* { 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 ("warn-dynamicstack,no-warn-dynamicstack")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 wd0" } } */
-/* { 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-warn-dynamicstack,warn-dynamicstack")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 wd1" } } */
-/* { 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-warn-dynamicstack")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 wd0" } } */
-/* { 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 ("warn-dynamicstack")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 wd1" } } */
-/* { 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-warn-dynamicstack")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 wd0" } } */
-/* { 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 ("warn-dynamicstack")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 wd1" } } */
-/* { 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-warn-dynamicstack")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 wd0" } } */
-/* { 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-warn-dynamicstack")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 wd0" } } */
-/* { 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 ("warn-dynamicstack")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 wd1" } } */
-/* { 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 ("warn-dynamicstack")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 wd1" } } */
-/* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-33.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-33.c
index 5476ad3..70d9a79 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-33.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-33.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -36,8 +36,8 @@ void fn_default_start (void) { }
 
 __attribute__ ((target ("arch=arch11")))
 void fn_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
@@ -57,8 +57,8 @@ void fn_att_1_default (void) { }
 
 __attribute__ ((target ("arch=arch8")))
 void fn_att_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
@@ -78,8 +78,8 @@ void fn_att_0_default (void) { }
 
 __attribute__ ((target ("arch=arch8,arch=arch11")))
 void fn_att_0_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
@@ -97,8 +97,8 @@ void fn_att_0_1 (void) { }
 
 __attribute__ ((target ("arch=arch11,arch=arch8")))
 void fn_att_1_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
@@ -122,8 +122,8 @@ void fn_att_1_0 (void) { }
 
 #pragma GCC target ("arch=arch11")
 void fn_pragma_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -160,8 +160,8 @@ void fn_pragma_1_default (void) { }
 
 #pragma GCC target ("arch=arch8")
 void fn_pragma_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -199,8 +199,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("arch=arch8")
 #pragma GCC target ("arch=arch11")
 void fn_pragma_0_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
@@ -220,8 +220,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("arch=arch11")
 #pragma GCC target ("arch=arch8")
 void fn_pragma_1_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
@@ -247,8 +247,8 @@ void fn_pragma_1_0 (void) { }
 #pragma GCC target ("arch=arch11")
 __attribute__ ((target ("arch=arch11")))
 void fn_pragma_1_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
@@ -268,8 +268,8 @@ void fn_pragma_1_att_1 (void) { }
 #pragma GCC target ("arch=arch11")
 __attribute__ ((target ("arch=arch11")))
 void fn_pragma_0_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
@@ -289,8 +289,8 @@ void fn_pragma_0_att_1 (void) { }
 #pragma GCC target ("arch=arch11")
 __attribute__ ((target ("arch=arch8")))
 void fn_pragma_1_att_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
@@ -310,8 +310,8 @@ void fn_pragma_1_att_0 (void) { }
 #pragma GCC target ("arch=arch11")
 __attribute__ ((target ("arch=arch8")))
 void fn_pragma_0_att_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-4.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-4.c
index 9b50913..ac795ea 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-4.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-4.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" } } */
@@ -36,8 +36,8 @@ void fn_default_start (void) { }
 
 __attribute__ ((target ("tune=z10")))
 void fn_att_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar4" } } */
 /* { 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" } } */
@@ -57,8 +57,8 @@ void fn_att_0_default (void) { }
 
 __attribute__ ((target ("tune=z13")))
 void fn_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar4" } } */
 /* { 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" } } */
@@ -78,8 +78,8 @@ void fn_att_1_default (void) { }
 
 __attribute__ ((target ("tune=z13,tune=z10")))
 void fn_att_1_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar4" } } */
 /* { 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" } } */
@@ -97,8 +97,8 @@ void fn_att_1_0 (void) { }
 
 __attribute__ ((target ("tune=z10,tune=z13")))
 void fn_att_0_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar4" } } */
 /* { 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" } } */
@@ -122,8 +122,8 @@ void fn_att_0_1 (void) { }
 
 #pragma GCC target ("tune=z10")
 void fn_pragma_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar4" } } */
 /* { 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" } } */
@@ -160,8 +160,8 @@ void fn_pragma_0_default (void) { }
 
 #pragma GCC target ("tune=z13")
 void fn_pragma_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar4" } } */
 /* { 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" } } */
@@ -199,8 +199,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("tune=z13")
 #pragma GCC target ("tune=z10")
 void fn_pragma_1_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar4" } } */
 /* { 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" } } */
@@ -220,8 +220,8 @@ void fn_pragma_1_0 (void) { }
 #pragma GCC target ("tune=z10")
 #pragma GCC target ("tune=z13")
 void fn_pragma_0_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar4" } } */
 /* { 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" } } */
@@ -247,8 +247,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("tune=z10")
 __attribute__ ((target ("tune=z10")))
 void fn_pragma_0_att_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar4" } } */
 /* { 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" } } */
@@ -268,8 +268,8 @@ void fn_pragma_0_att_0 (void) { }
 #pragma GCC target ("tune=z10")
 __attribute__ ((target ("tune=z10")))
 void fn_pragma_1_att_0 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar4" } } */
 /* { 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" } } */
@@ -289,8 +289,8 @@ void fn_pragma_1_att_0 (void) { }
 #pragma GCC target ("tune=z10")
 __attribute__ ((target ("tune=z13")))
 void fn_pragma_0_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar4" } } */
 /* { 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" } } */
@@ -310,8 +310,8 @@ void fn_pragma_0_att_1 (void) { }
 #pragma GCC target ("tune=z10")
 __attribute__ ((target ("tune=z13")))
 void fn_pragma_1_att_1 (void) { }
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar4" } } */
 /* { 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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-5.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-5.c
index bfc8803..2c185c3 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-5.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-5.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("stack-size=4096")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 wf0" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("stack-size=2048")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 ss2048" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 wf0" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("stack-size=2048,stack-size=4096")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 wf0" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("stack-size=4096,stack-size=2048")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss2048" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 wf0" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("stack-size=4096")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 wf0" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("stack-size=2048")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss2048" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 wf0" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("stack-size=4096")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 wf0" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("stack-size=2048")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss2048" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 wf0" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("stack-size=4096")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 wf0" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("stack-size=4096")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 wf0" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("stack-size=2048")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss2048" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 wf0" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("stack-size=2048")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss2048" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 wf0" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-6.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-6.c
index b3bc0f6..1487f97 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-6.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-6.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 ("stack-size=2048")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 ss2048" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 wf512" } } */
@@ -58,8 +58,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("stack-size=4096")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 wf512" } } */
@@ -79,8 +79,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("stack-size=4096,stack-size=2048")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss2048" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 wf512" } } */
@@ -98,8 +98,8 @@ void fn_att_1_0 (void) { }
 __attribute__ ((target ("stack-size=2048,stack-size=4096")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 wf512" } } */
@@ -123,8 +123,8 @@ void fn_att_0_1 (void) { }
 #pragma GCC target ("stack-size=2048")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss2048" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 wf512" } } */
@@ -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 ("stack-size=4096")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 wf512" } } */
@@ -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 ("stack-size=2048")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss2048" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 wf512" } } */
@@ -221,8 +221,8 @@ void fn_pragma_1_0 (void) { }
 #pragma GCC target ("stack-size=4096")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 wf512" } } */
@@ -248,8 +248,8 @@ void fn_pragma_0_1 (void) { }
 __attribute__ ((target ("stack-size=2048")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss2048" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 wf512" } } */
@@ -269,8 +269,8 @@ void fn_pragma_0_att_0 (void) { }
 __attribute__ ((target ("stack-size=2048")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss2048" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 wf512" } } */
@@ -290,8 +290,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("stack-size=4096")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 wf512" } } */
@@ -311,8 +311,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("stack-size=4096")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
-/* { 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 sg16" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 wf512" } } */
@@ -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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-7.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-7.c
index ac0b08d..1195982 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-7.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-7.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("stack-guard=16")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 sg16" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 wf0" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("stack-guard=0")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 wf0" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("stack-guard=0,stack-guard=16")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg16" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 wf0" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("stack-guard=16,stack-guard=0")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 wf0" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("stack-guard=16")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg16" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 wf0" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("stack-guard=0")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 wf0" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("stack-guard=16")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg16" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 wf0" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("stack-guard=0")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 wf0" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("stack-guard=16")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg16" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 wf0" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("stack-guard=16")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg16" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 wf0" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("stack-guard=0")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 wf0" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("stack-guard=0")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc2" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 wf0" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-8.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-8.c
index 9ceca50..b14042b 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-8.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-8.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 ("stack-guard=0")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 wf512" } } */
@@ -58,8 +58,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("stack-guard=16")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 sg16" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 wf512" } } */
@@ -79,8 +79,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("stack-guard=16,stack-guard=0")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 wf512" } } */
@@ -98,8 +98,8 @@ void fn_att_1_0 (void) { }
 __attribute__ ((target ("stack-guard=0,stack-guard=16")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg16" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 wf512" } } */
@@ -123,8 +123,8 @@ void fn_att_0_1 (void) { }
 #pragma GCC target ("stack-guard=0")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 wf512" } } */
@@ -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 ("stack-guard=16")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg16" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 wf512" } } */
@@ -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 ("stack-guard=0")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 wf512" } } */
@@ -221,8 +221,8 @@ void fn_pragma_1_0 (void) { }
 #pragma GCC target ("stack-guard=16")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg16" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 wf512" } } */
@@ -248,8 +248,8 @@ void fn_pragma_0_1 (void) { }
 __attribute__ ((target ("stack-guard=0")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 wf512" } } */
@@ -269,8 +269,8 @@ void fn_pragma_0_att_0 (void) { }
 __attribute__ ((target ("stack-guard=0")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 wf512" } } */
@@ -290,8 +290,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("stack-guard=16")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg16" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 wf512" } } */
@@ -311,8 +311,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("stack-guard=16")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg16" } } */
-/* { 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 bc1" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 wf512" } } */
@@ -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" } } */
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-9.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-9.c
index ac63555..a3d791b 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-9.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-m64-9.c
@@ -11,8 +11,8 @@
  **/
 
 void fn_default_start (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_start ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_start tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_start tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_start bc2" } } */
@@ -37,8 +37,8 @@ void fn_default_start (void) { }
 __attribute__ ((target ("branch-cost=2")))
 void fn_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1 bc2" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1 wf0" } } */
@@ -58,8 +58,8 @@ void fn_att_1_default (void) { }
 __attribute__ ((target ("branch-cost=1")))
 void fn_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0 bc1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0 wf0" } } */
@@ -79,8 +79,8 @@ void fn_att_0_default (void) { }
 __attribute__ ((target ("branch-cost=1,branch-cost=2")))
 void fn_att_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_0_1 bc2" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_0_1 wf0" } } */
@@ -98,8 +98,8 @@ void fn_att_0_1 (void) { }
 __attribute__ ((target ("branch-cost=2,branch-cost=1")))
 void fn_att_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_att_1_0 bc1" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_att_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_att_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_att_1_0 wf0" } } */
@@ -123,8 +123,8 @@ void fn_att_1_0 (void) { }
 #pragma GCC target ("branch-cost=2")
 void fn_pragma_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1 bc2" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1 wf0" } } */
@@ -141,8 +141,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_default bc2" } } */
@@ -161,8 +161,8 @@ void fn_pragma_1_default (void) { }
 #pragma GCC target ("branch-cost=1")
 void fn_pragma_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0 bc1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0 wf0" } } */
@@ -179,8 +179,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 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_default tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_default bc2" } } */
@@ -200,8 +200,8 @@ void fn_pragma_0_default (void) { }
 #pragma GCC target ("branch-cost=2")
 void fn_pragma_0_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 bc2" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_1 wf0" } } */
@@ -221,8 +221,8 @@ void fn_pragma_0_1 (void) { }
 #pragma GCC target ("branch-cost=1")
 void fn_pragma_1_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 bc1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_0 wf0" } } */
@@ -248,8 +248,8 @@ void fn_pragma_1_0 (void) { }
 __attribute__ ((target ("branch-cost=2")))
 void fn_pragma_1_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 bc2" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_1 wf0" } } */
@@ -269,8 +269,8 @@ void fn_pragma_1_att_1 (void) { }
 __attribute__ ((target ("branch-cost=2")))
 void fn_pragma_0_att_1 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 bc2" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_1 wf0" } } */
@@ -290,8 +290,8 @@ void fn_pragma_0_att_1 (void) { }
 __attribute__ ((target ("branch-cost=1")))
 void fn_pragma_1_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 bc1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_1_att_0 wf0" } } */
@@ -311,8 +311,8 @@ void fn_pragma_1_att_0 (void) { }
 __attribute__ ((target ("branch-cost=1")))
 void fn_pragma_0_att_0 (void) { }
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 bc1" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_pragma_0_att_0 wf0" } } */
@@ -335,8 +335,8 @@ void fn_pragma_0_att_0 (void) { }
  **/
 
 void fn_default_end (void) { }
-/* { dg-final { scan-assembler "fn:fn_default_end ar9" } } */
-/* { dg-final { scan-assembler "fn:fn_default_end tu6" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end ar7" } } */
+/* { dg-final { scan-assembler "fn:fn_default_end tu4" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end ss4096" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end sg0" } } */
 /* { dg-final { scan-assembler "fn:fn_default_end bc2" } } */