s390: Deprecate ESA/390 support

Deprecate support for the ESA/390 architecture which will be eventually
removed, and encourage the usage of the z/Architecture instead.

Furthermore, default for -m31 to -mzarch whereas previously we defaulted
to -mesa.

gcc/ChangeLog:

	* config.gcc: Fail in case of option --with-mode=esa.
	* config/s390/s390.cc (s390_option_override_internal): Default
	to z/Architecture mode.
	* config/s390/s390.h (DRIVER_SELF_SPECS): Ditto.
	* config/s390/s390.opt: Emit a warning for option -mesa.
	* doc/invoke.texi: Document the change.

gcc/testsuite/ChangeLog:

	* gcc.target/s390/20020926-1.c: Deal with deprecation warning.
	* gcc.target/s390/dwarfregtable-1.c: Ditto.
	* gcc.target/s390/fp2int1.c: Ditto.
	* gcc.target/s390/pr102222.c: Ditto.
	* gcc.target/s390/pr106355-3.c: Ditto.
	* gcc.target/s390/pr61078.c: Ditto.
	* gcc.target/s390/target-attribute/tattr-m31-10.c: Ditto.
	* gcc.target/s390/target-attribute/tattr-m31-12.c: Ditto.
	* gcc.target/s390/target-attribute/tattr-m31-14.c: Ditto.
	* gcc.target/s390/target-attribute/tattr-m31-18.c: Ditto.
	* gcc.target/s390/target-attribute/tattr-m31-2.c: Ditto.
	* gcc.target/s390/target-attribute/tattr-m31-20.c: Ditto.
	* gcc.target/s390/target-attribute/tattr-m31-22.c: Ditto.
	* gcc.target/s390/target-attribute/tattr-m31-24.c: Ditto.
	* gcc.target/s390/target-attribute/tattr-m31-26.c: Ditto.
	* gcc.target/s390/target-attribute/tattr-m31-28.c: Ditto.
	* gcc.target/s390/target-attribute/tattr-m31-30.c: Ditto.
	* gcc.target/s390/target-attribute/tattr-m31-32.c: Ditto.
	* gcc.target/s390/target-attribute/tattr-m31-4.c: Ditto.
	* gcc.target/s390/target-attribute/tattr-m31-6.c: Ditto.
	* gcc.target/s390/target-attribute/tattr-m31-8.c: Ditto.

26 files changed, 34 insertions, 10 deletions

diff --git a/gcc/config.gcc b/gcc/config.gcc
index a518e97..c4816e2 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -5768,9 +5768,13 @@ case "${target}" in
 		done
 
 		case ${with_mode} in
-		"" | esa | zarch)
+		"" | zarch)
 			# OK
 			;;
+		esa)
+			echo "Support for ESA/390 is deprecated; use z/Architecture instead." 1>&2
+			exit 1
+			;;
 		*)
 			echo "Unknown architecture mode used in --with-mode=$with_mode." 1>&2
 			exit 1
diff --git a/gcc/config/s390/s390.cc b/gcc/config/s390/s390.cc
index 2f51696..645aedb 100644
--- a/gcc/config/s390/s390.cc
+++ b/gcc/config/s390/s390.cc
@@ -16231,12 +16231,7 @@ s390_option_override_internal (struct gcc_options *opts,
 {
   /* Architecture mode defaults according to ABI.  */
   if (!(opts_set->x_target_flags & MASK_ZARCH))
-    {
-      if (TARGET_64BIT)
-	opts->x_target_flags |= MASK_ZARCH;
-      else
-	opts->x_target_flags &= ~MASK_ZARCH;
-    }
+    opts->x_target_flags |= MASK_ZARCH;
 
   /* Set the march default in case it hasn't been specified on cmdline.  */
   if (!opts_set->x_s390_arch)
diff --git a/gcc/config/s390/s390.h b/gcc/config/s390/s390.h
index 6f7195d..5731ae9 100644
--- a/gcc/config/s390/s390.h
+++ b/gcc/config/s390/s390.h
@@ -302,7 +302,7 @@ extern const char *s390_host_detect_local_cpu (int argc, const char **argv);
 #define DRIVER_SELF_SPECS					\
   MARCH_MTUNE_NATIVE_SPECS,					\
   "%{!m31:%{!m64:-m" S390_TARGET_BITS_STRING "}}",		\
-  "%{!mesa:%{!mzarch:%{m31:-mesa}%{m64:-mzarch}}}",		\
+  "%{!mesa:%{!mzarch:-mzarch}}",				\
   "%{!march=*:-march=z900}"
 
 /* Target machine storage layout.  */
diff --git a/gcc/config/s390/s390.opt b/gcc/config/s390/s390.opt
index f064597..f0cb07a 100644
--- a/gcc/config/s390/s390.opt
+++ b/gcc/config/s390/s390.opt
@@ -136,7 +136,7 @@ Target Mask(DEBUG_ARG) Save
 Additional debug prints.
 
 mesa
-Target RejectNegative Negative(mzarch) InverseMask(ZARCH)
+Target RejectNegative Negative(mzarch) InverseMask(ZARCH) Warn(%<-mesa%> is deprecated and support for ESA/390 will be removed; use %<-mzarch%> instead)
 ESA/390 architecture.
 
 mhard-dfp
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index afa269b..4fbb4cd 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -33114,7 +33114,10 @@ GNU/Linux for S/390 ABI@.  When @option{-m64} is specified, generate
 code compliant to the GNU/Linux for zSeries ABI@.  This allows GCC in
 particular to generate 64-bit instructions.  For the @samp{s390}
 targets, the default is @option{-m31}, while the @samp{s390x}
-targets default to @option{-m64}.
+targets default to @option{-m64}.  Note, previously, @option{-m31} defaulted to
+@option{-mesa} unless @option{-mzarch} was explicitely specified.  Now,
+@option{-m31} defaults to @option{-mzarch} unless @option{-mesa} is explicitely
+specified since ESA/390 support is deprecated and will be removed.
 
 @opindex mzarch
 @opindex mesa
@@ -33128,6 +33131,7 @@ not possible with @option{-m64}.
 When generating code compliant to the GNU/Linux for S/390 ABI,
 the default is @option{-mesa}.  When generating code compliant
 to the GNU/Linux for zSeries ABI, the default is @option{-mzarch}.
+Option @option{-mesa} is deprecated and support for ESA/390 will be removed.
 
 @opindex mhtm
 @opindex mno-htm
diff --git a/gcc/testsuite/gcc.target/s390/20020926-1.c b/gcc/testsuite/gcc.target/s390/20020926-1.c
index aaa1342..868a0ad 100644
--- a/gcc/testsuite/gcc.target/s390/20020926-1.c
+++ b/gcc/testsuite/gcc.target/s390/20020926-1.c
@@ -3,6 +3,7 @@
 
 /* { dg-do compile { target { s390-*-* } } } */
 /* { dg-options "-O2 -mesa" } */
+/* { dg-excess-errors "-mesa is deprecated" } */
 
 int test (int *addr)
 {
diff --git a/gcc/testsuite/gcc.target/s390/dwarfregtable-1.c b/gcc/testsuite/gcc.target/s390/dwarfregtable-1.c
index b125498..6c7d231 100644
--- a/gcc/testsuite/gcc.target/s390/dwarfregtable-1.c
+++ b/gcc/testsuite/gcc.target/s390/dwarfregtable-1.c
@@ -2,6 +2,7 @@
 
 /* { dg-do compile { target { ! lp64 } } } */
 /* { dg-options "-mesa" } */
+/* { dg-excess-errors "-mesa is deprecated" } */
 
 #define DWARF_FRAME_REGISTERS 34
 
diff --git a/gcc/testsuite/gcc.target/s390/fp2int1.c b/gcc/testsuite/gcc.target/s390/fp2int1.c
index 4a90a8b..4b359b7 100644
--- a/gcc/testsuite/gcc.target/s390/fp2int1.c
+++ b/gcc/testsuite/gcc.target/s390/fp2int1.c
@@ -7,6 +7,7 @@
 /* { dg-do run { target s390-*-* } } */
 /* { dg-options "-O3 -mesa" } */
 /* { dg-require-effective-target fenv_exceptions } */
+/* { dg-excess-errors "-mesa is deprecated" } */
 
 #define _GNU_SOURCE
 #include <stdlib.h>
diff --git a/gcc/testsuite/gcc.target/s390/pr102222.c b/gcc/testsuite/gcc.target/s390/pr102222.c
index 47d075e..8ab1472 100644
--- a/gcc/testsuite/gcc.target/s390/pr102222.c
+++ b/gcc/testsuite/gcc.target/s390/pr102222.c
@@ -1,5 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -m31 -mesa" } */
+/* { dg-excess-errors "-mesa is deprecated" } */
 
 struct squashfs_reg_inode_header_1 read_inode_inode;
 
diff --git a/gcc/testsuite/gcc.target/s390/pr106355-3.c b/gcc/testsuite/gcc.target/s390/pr106355-3.c
index 39daea4..f4f7f36 100644
--- a/gcc/testsuite/gcc.target/s390/pr106355-3.c
+++ b/gcc/testsuite/gcc.target/s390/pr106355-3.c
@@ -1,6 +1,7 @@
 /* { dg-do compile { target { s390-*-* } } } */
 /* { dg-options "-foptimize-sibling-calls -mesa" } */
 /* { dg-final { scan-assembler {brasl\t%r\d+,bar} } } */
+/* { dg-excess-errors "-mesa is deprecated" } */
 
 /* This tests function s390_call_saved_register_used where
    REG_P (parm_rtx) and nregs == 2 holds.  */
diff --git a/gcc/testsuite/gcc.target/s390/pr61078.c b/gcc/testsuite/gcc.target/s390/pr61078.c
index 40f6ad7..827c3fe 100644
--- a/gcc/testsuite/gcc.target/s390/pr61078.c
+++ b/gcc/testsuite/gcc.target/s390/pr61078.c
@@ -3,6 +3,7 @@
 
 /* { dg-do run { target { ! lp64 } } } */
 /* { dg-options "-O2 -mesa" } */
+/* { dg-excess-errors "-mesa is deprecated" } */
 
 extern void abort (void);
 
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 f1beb1d..421a08e 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
@@ -3,6 +3,7 @@
 /* { dg-do assemble { target { ! lp64 } } } */
 /* { dg-require-effective-target target_attribute } */
 /* { dg-options "-save-temps -mdebug -m31 -march=z10 -mtune=z13 -mstack-size=2048 -mstack-guard=16 -mbranch-cost=1 -mwarn-framesize=512 -mno-hard-dfp -mbackchain -msoft-float -mno-vx -mno-htm -mno-packed-stack -msmall-exec -mno-zvector -mmvcle -mesa -mno-warn-dynamicstack" } */
+/* { dg-excess-errors "-mesa is deprecated" } */
 
 /**
  **
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 8868f91..61fb7e9 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
@@ -3,6 +3,7 @@
 /* { dg-do assemble { target { ! lp64 } } } */
 /* { dg-require-effective-target target_attribute } */
 /* { dg-options "-save-temps -mdebug -m31 -march=z10 -mtune=z13 -mstack-size=2048 -mstack-guard=16 -mbranch-cost=1 -mwarn-framesize=512 -mno-hard-dfp -mbackchain -msoft-float -mno-vx -mno-htm -mno-packed-stack -msmall-exec -mno-zvector -mmvcle -mesa -mno-warn-dynamicstack" } */
+/* { dg-excess-errors "-mesa is deprecated" } */
 
 /**
  **
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 f928bef..6b3780e 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
@@ -3,6 +3,7 @@
 /* { dg-do assemble { target { ! lp64 } } } */
 /* { dg-require-effective-target target_attribute } */
 /* { dg-options "-save-temps -mdebug -m31 -march=z10 -mtune=z13 -mstack-size=2048 -mstack-guard=16 -mbranch-cost=1 -mwarn-framesize=512 -mno-hard-dfp -mbackchain -msoft-float -mno-vx -mno-htm -mno-packed-stack -msmall-exec -mno-zvector -mmvcle -mesa -mno-warn-dynamicstack" } */
+/* { dg-excess-errors "-mesa is deprecated" } */
 
 /**
  **
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 878f002..2459bae 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
@@ -3,6 +3,7 @@
 /* { dg-do assemble { target { ! lp64 } } } */
 /* { dg-require-effective-target target_attribute } */
 /* { dg-options "-save-temps -mdebug -m31 -march=z10 -mtune=z13 -mstack-size=2048 -mstack-guard=16 -mbranch-cost=1 -mwarn-framesize=512 -mno-hard-dfp -mbackchain -msoft-float -mno-vx -mno-htm -mno-packed-stack -msmall-exec -mno-zvector -mmvcle -mesa -mno-warn-dynamicstack" } */
+/* { dg-excess-errors "-mesa is deprecated" } */
 
 /**
  **
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 c663b9e..e32040c 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
@@ -3,6 +3,7 @@
 /* { dg-do assemble { target { ! lp64 } } } */
 /* { dg-require-effective-target target_attribute } */
 /* { dg-options "-save-temps -mdebug -m31 -march=z10 -mtune=z13 -mstack-size=2048 -mstack-guard=16 -mbranch-cost=1 -mwarn-framesize=512 -mno-hard-dfp -mbackchain -msoft-float -mno-vx -mno-htm -mno-packed-stack -msmall-exec -mno-zvector -mmvcle -mesa -mno-warn-dynamicstack" } */
+/* { dg-excess-errors "-mesa is deprecated" } */
 
 /**
  **
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 e9eacaa..75a1e88 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
@@ -3,6 +3,7 @@
 /* { dg-do assemble { target { ! lp64 } } } */
 /* { dg-require-effective-target target_attribute } */
 /* { dg-options "-save-temps -mdebug -m31 -march=z10 -mtune=z13 -mstack-size=2048 -mstack-guard=16 -mbranch-cost=1 -mwarn-framesize=512 -mno-hard-dfp -mbackchain -msoft-float -mno-vx -mno-htm -mno-packed-stack -msmall-exec -mno-zvector -mmvcle -mesa -mno-warn-dynamicstack" } */
+/* { dg-excess-errors "-mesa is deprecated" } */
 
 /**
  **
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 1595475..573e931 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
@@ -3,6 +3,7 @@
 /* { dg-do assemble { target { ! lp64 } } } */
 /* { dg-require-effective-target target_attribute } */
 /* { dg-options "-save-temps -mdebug -m31 -march=z13 -mtune=z13 -mstack-size=2048 -mstack-guard=16 -mbranch-cost=1 -mwarn-framesize=512 -mno-hard-dfp -mbackchain -mhard-float -mno-vx -mno-htm -mno-packed-stack -msmall-exec -mno-zvector -mmvcle -mesa -mno-warn-dynamicstack" } */
+/* { dg-excess-errors "-mesa is deprecated" } */
 
 /**
  **
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 87e4da5..49f908b 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
@@ -3,6 +3,7 @@
 /* { dg-do assemble { target { ! lp64 } } } */
 /* { dg-require-effective-target target_attribute } */
 /* { dg-options "-save-temps -mdebug -m31 -march=z10 -mtune=z13 -mstack-size=2048 -mstack-guard=16 -mbranch-cost=1 -mwarn-framesize=512 -mno-hard-dfp -mno-backchain -msoft-float -mno-vx -mno-htm -mno-packed-stack -msmall-exec -mno-zvector -mmvcle -mesa -mno-warn-dynamicstack" } */
+/* { dg-excess-errors "-mesa is deprecated" } */
 
 /**
  **
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 e4b49dc..4d8e023 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
@@ -3,6 +3,7 @@
 /* { dg-do assemble { target { ! lp64 } } } */
 /* { dg-require-effective-target target_attribute } */
 /* { dg-options "-save-temps -mdebug -m31 -march=z10 -mtune=z13 -mstack-size=2048 -mstack-guard=16 -mbranch-cost=1 -mwarn-framesize=512 -mno-hard-dfp -mbackchain -msoft-float -mno-vx -mno-htm -mno-packed-stack -msmall-exec -mno-zvector -mmvcle -mesa -mno-warn-dynamicstack" } */
+/* { dg-excess-errors "-mesa is deprecated" } */
 
 /**
  **
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 ae784a6..4d23cad 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
@@ -3,6 +3,7 @@
 /* { dg-do assemble { target { ! lp64 } } } */
 /* { dg-require-effective-target target_attribute } */
 /* { dg-options "-save-temps -mdebug -m31 -march=z10 -mtune=z13 -mstack-size=2048 -mstack-guard=16 -mbranch-cost=1 -mwarn-framesize=512 -mno-hard-dfp -mbackchain -msoft-float -mno-vx -mno-htm -mno-packed-stack -msmall-exec -mno-zvector -mmvcle -mesa -mno-warn-dynamicstack" } */
+/* { dg-excess-errors "-mesa is deprecated" } */
 
 /**
  **
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 f82d9ee..cbe4c91 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
@@ -3,6 +3,7 @@
 /* { dg-do assemble { target { ! lp64 } } } */
 /* { dg-require-effective-target target_attribute } */
 /* { dg-options "-save-temps -mdebug -m31 -march=z10 -mtune=z13 -mstack-size=2048 -mstack-guard=16 -mbranch-cost=1 -mwarn-framesize=512 -mno-hard-dfp -mbackchain -msoft-float -mno-vx -mno-htm -mno-packed-stack -msmall-exec -mno-zvector -mmvcle -mesa -mno-warn-dynamicstack" } */
+/* { dg-excess-errors "-mesa is deprecated" } */
 
 /**
  **
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 6bdc55a..ea6f482 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
@@ -3,6 +3,7 @@
 /* { dg-do assemble { target { ! lp64 } } } */
 /* { dg-require-effective-target target_attribute } */
 /* { dg-options "-save-temps -mdebug -m31 -march=z10 -mtune=z13 -mstack-size=2048 -mstack-guard=16 -mbranch-cost=1 -mwarn-framesize=512 -mno-hard-dfp -mbackchain -msoft-float -mno-vx -mno-htm -mno-packed-stack -msmall-exec -mno-zvector -mmvcle -mesa -mno-warn-dynamicstack" } */
+/* { dg-excess-errors "-mesa is deprecated" } */
 
 /**
  **
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 5780f96..08358bb 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
@@ -3,6 +3,7 @@
 /* { dg-do assemble { target { ! lp64 } } } */
 /* { dg-require-effective-target target_attribute } */
 /* { dg-options "-save-temps -mdebug -m31 -march=z10 -mtune=z13 -mstack-size=2048 -mstack-guard=16 -mbranch-cost=1 -mwarn-framesize=512 -mno-hard-dfp -mbackchain -msoft-float -mno-vx -mno-htm -mno-packed-stack -msmall-exec -mno-zvector -mmvcle -mesa -mno-warn-dynamicstack" } */
+/* { dg-excess-errors "-mesa is deprecated" } */
 
 /**
  **
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 a946ff8..2692c86 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
@@ -3,6 +3,7 @@
 /* { dg-do assemble { target { ! lp64 } } } */
 /* { dg-require-effective-target target_attribute } */
 /* { dg-options "-save-temps -mdebug -m31 -march=z10 -mtune=z13 -mstack-size=2048 -mstack-guard=16 -mbranch-cost=1 -mwarn-framesize=512 -mno-hard-dfp -mbackchain -msoft-float -mno-vx -mno-htm -mno-packed-stack -msmall-exec -mno-zvector -mmvcle -mesa -mno-warn-dynamicstack" } */
+/* { dg-excess-errors "-mesa is deprecated" } */
 
 /**
  **
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 fee9644..a601511 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
@@ -3,6 +3,7 @@
 /* { dg-do assemble { target { ! lp64 } } } */
 /* { dg-require-effective-target target_attribute } */
 /* { dg-options "-save-temps -mdebug -m31 -march=z10 -mtune=z13 -mstack-size=2048 -mstack-guard=16 -mbranch-cost=1 -mwarn-framesize=512 -mno-hard-dfp -mbackchain -msoft-float -mno-vx -mno-htm -mno-packed-stack -msmall-exec -mno-zvector -mmvcle -mesa -mno-warn-dynamicstack" } */
+/* { dg-excess-errors "-mesa is deprecated" } */
 
 /**
  **