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.
---
gcc/config.gcc | 6 +++++-
gcc/config/s390/s390.cc | 7 +------
gcc/config/s390/s390.h | 2 +-
gcc/config/s390/s390.opt | 2 +-
gcc/doc/invoke.texi | 6 +++++-
gcc/testsuite/gcc.target/s390/20020926-1.c | 1 +
gcc/testsuite/gcc.target/s390/dwarfregtable-1.c | 1 +
gcc/testsuite/gcc.target/s390/fp2int1.c | 1 +
gcc/testsuite/gcc.target/s390/pr102222.c | 1 +
gcc/testsuite/gcc.target/s390/pr106355-3.c | 1 +
gcc/testsuite/gcc.target/s390/pr61078.c | 1 +
.../gcc.target/s390/target-attribute/tattr-m31-10.c | 1 +
.../gcc.target/s390/target-attribute/tattr-m31-12.c | 1 +
.../gcc.target/s390/target-attribute/tattr-m31-14.c | 1 +
.../gcc.target/s390/target-attribute/tattr-m31-18.c | 1 +
.../gcc.target/s390/target-attribute/tattr-m31-2.c | 1 +
.../gcc.target/s390/target-attribute/tattr-m31-20.c | 1 +
.../gcc.target/s390/target-attribute/tattr-m31-22.c | 1 +
.../gcc.target/s390/target-attribute/tattr-m31-24.c | 1 +
.../gcc.target/s390/target-attribute/tattr-m31-26.c | 1 +
.../gcc.target/s390/target-attribute/tattr-m31-28.c | 1 +
.../gcc.target/s390/target-attribute/tattr-m31-30.c | 1 +
.../gcc.target/s390/target-attribute/tattr-m31-32.c | 1 +
.../gcc.target/s390/target-attribute/tattr-m31-4.c | 1 +
.../gcc.target/s390/target-attribute/tattr-m31-6.c | 1 +
.../gcc.target/s390/target-attribute/tattr-m31-8.c | 1 +
26 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/gcc/config.gcc b/gcc/config.gcc
index a518e976b82..c4816e26f82 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 29aef501fdd..3061c6c9bf7 100644
--- a/gcc/config/s390/s390.cc
+++ b/gcc/config/s390/s390.cc
@@ -16211,12 +16211,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 6f7195db04e..5731ae99bcd 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 f064597f836..f0cb07a871a 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 fd1ce063a37..2e12a4df802 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -33097,7 +33097,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
@@ -33111,6 +33114,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 aaa13427696..868a0ad8689 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 b1254987451..6c7d231f50e 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 4a90a8b91de..4b359b7741b 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 47d075e47fc..8ab14721c2a 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 39daea44fc4..f4f7f366bfa 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 40f6ad7df09..827c3fe6bf8 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 f1beb1d8773..421a08e49fb 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 8868f91df52..61fb7e9db5d 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 f928befa057..6b3780ec825 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 878f0020b43..2459bae92fa 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 c663b9eb75c..e32040c207c 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 e9eacaa07a2..75a1e88d059 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 15954759ac9..573e931673f 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 87e4da5750a..49f908b951d 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 e4b49dc052f..4d8e023fcf0 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 ae784a63533..4d23cad7153 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 f82d9ee216f..cbe4c9135bf 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 6bdc55af5d9..ea6f482eccd 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 5780f96500f..08358bbaf06 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 a946ff85177..2692c864886 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 fee9644a505..a601511f2ce 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" } */
/**
**
--
2.47.0
