Revert "s390: Deprecate ESA/390 support"

The intention of -m31 -mesa and -m31 -mzarch was that they are (ABI)
compatible which is almost true except as it turns out they are not for
attribute mode(word).

After doing some archaeology and digging out an over 18 year old thread
[1,2] which is about this very attribute, I come to the conclusion to
revert this patch.  The intention by deprecating and eventually removing
ESA/390 support was to prepare for a future removal of -m31; though in
smaller steps.  Thus, instead of introducing some potential hick ups
along the route, I will revert this patch and will revisit this topic
when time for -m31 in its entirety has come---independent of
-mesa/-mzarch.

[1] https://gcc.gnu.org/pipermail/gcc-patches/2006-September/200465.html
[2] https://gcc.gnu.org/pipermail/gcc-patches/2006-October/201154.html

This reverts commit 3b1bd1fdcd241dd1e5b706b6937400d74ca43146.

diff --git a/gcc/config.gcc b/gcc/config.gcc
index c4816e26f82f54e54c1f181908ffe0f76590b069..a518e976b82e8feaecf5c31a6293e04a0519f6cd 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -5768,13 +5768,9 @@ case "${target}" in
                done
 
                case ${with_mode} in
-               "" | zarch)
+               "" | esa | 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 d4e849b12de61618a047f43677170839aa658bce..9df3c4edb0b29e20fcd001f242e95c1193bc812d 100644 (file)
--- a/gcc/config/s390/s390.cc
+++ b/gcc/config/s390/s390.cc
@@ -16246,7 +16246,12 @@ s390_option_override_internal (struct gcc_options *opts,
 {
   /* Architecture mode defaults according to ABI.  */
   if (!(opts_set->x_target_flags & MASK_ZARCH))
-    opts->x_target_flags |= MASK_ZARCH;
+    {
+      if (TARGET_64BIT)
+       opts->x_target_flags |= MASK_ZARCH;
+      else
+       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 5731ae99bcd5ff614f28e2b0a174fc45dcb6e297..6f7195db04e18486e7b4b8fd36f4fc9ac1b07a7c 100644 (file)
--- 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:-mzarch}}",                               \
+  "%{!mesa:%{!mzarch:%{m31:-mesa}%{m64:-mzarch}}}",            \
   "%{!march=*:-march=z900}"
 
 /* Target machine storage layout.  */

diff --git a/gcc/config/s390/s390.opt b/gcc/config/s390/s390.opt
index f0cb07a871a6c2f0e32e853e6b3c729f99bc65b8..f064597f8367046763983d1903bb67c373f62454 100644 (file)
--- 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) Warn(%<-mesa%> is deprecated and support for ESA/390 will be removed; use %<-mzarch%> instead)
+Target RejectNegative Negative(mzarch) InverseMask(ZARCH)
 ESA/390 architecture.
 
 mhard-dfp

diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 1819bcdcdfb9b640ed5ca0629414e6df31ffc0d2..a2d327d7c99782ea1bc42ab6332579a8a36b2ee8 100644 (file)
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -33114,10 +33114,7 @@ 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}.  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.
+targets default to @option{-m64}.
 
 @opindex mzarch
 @opindex mesa
@@ -33131,7 +33128,6 @@ 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 868a0ad8689c5f1998a43a1e85d41a9eec4d3bb3..aaa1342769682c7360df203d5368db095af29d36 100644 (file)
--- a/gcc/testsuite/gcc.target/s390/20020926-1.c
+++ b/gcc/testsuite/gcc.target/s390/20020926-1.c
@@ -3,7 +3,6 @@
 
 /* { 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 6c7d231f50ec5243e74f3fd7fa7612db82ae86e4..b125498745155ab5c260ea1ef2e0a8c4f81ecd77 100644 (file)
--- a/gcc/testsuite/gcc.target/s390/dwarfregtable-1.c
+++ b/gcc/testsuite/gcc.target/s390/dwarfregtable-1.c
@@ -2,7 +2,6 @@
 
 /* { 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 4b359b7741bb7d407af3fd23d3cc5b0385d44e57..4a90a8b91deda3ad6748e633f262aa96e2d629ea 100644 (file)
--- a/gcc/testsuite/gcc.target/s390/fp2int1.c
+++ b/gcc/testsuite/gcc.target/s390/fp2int1.c
@@ -7,7 +7,6 @@
 /* { 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 8ab14721c2a488dd1e72f72521deb861d885889f..47d075e47fcc7a79e861a6f4d0f2783ca2342e28 100644 (file)
--- a/gcc/testsuite/gcc.target/s390/pr102222.c
+++ b/gcc/testsuite/gcc.target/s390/pr102222.c
@@ -1,6 +1,5 @@
 /* { 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 f4f7f366bfae6fabd39ff973ea99ce3762dfc716..39daea44fc4a3d205272144cbd47da57fe9a920b 100644 (file)
--- a/gcc/testsuite/gcc.target/s390/pr106355-3.c
+++ b/gcc/testsuite/gcc.target/s390/pr106355-3.c
@@ -1,7 +1,6 @@
 /* { 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 827c3fe6bf83bee5ba79213e03af13196dc010f2..40f6ad7df098465d9e8db489d7a94e1741162b10 100644 (file)
--- a/gcc/testsuite/gcc.target/s390/pr61078.c
+++ b/gcc/testsuite/gcc.target/s390/pr61078.c
@@ -3,7 +3,6 @@
 
 /* { 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 421a08e49fba2d35561b17b39dc848d9395f3319..f1beb1d8773e25ac8f6ff3989bc170d063f20957 100644 (file)
--- 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,7 +3,6 @@
 /* { 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 61fb7e9db5d5d261a422903a3ac325ca2e63ed78..8868f91df52f7ed565a93b3cf52dba94f3fbef62 100644 (file)
--- 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,7 +3,6 @@
 /* { 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 6b3780ec825e15ed0b84c7853f9eb79765e387b3..f928befa057665dd6a4215cece3a9be5b4e80540 100644 (file)
--- 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,7 +3,6 @@
 /* { 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 2459bae92fad353c79f90f9e2d409ef135ff8b99..878f0020b4377b192c0c4336a6191887b039e6fc 100644 (file)
--- 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,7 +3,6 @@
 /* { 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 e32040c207cd3c479c93664155717ac22e6f7f18..c663b9eb75c828742ed362d021e95106cbe9aea8 100644 (file)
--- 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,7 +3,6 @@
 /* { 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 75a1e88d059fd01a47dd4f9b85c64e0d86dfddf7..e9eacaa07a20bc21b8b0252884ee4afe35c0bbea 100644 (file)
--- 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,7 +3,6 @@
 /* { 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 573e931673f38b96655ccaee434bf17609d135c8..15954759ac96018def81cae7ec41373288332c34 100644 (file)
--- 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,7 +3,6 @@
 /* { 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 49f908b951dd54d3fa4f6f784e24ee210c6611d9..87e4da5750a3f9b60fc796f17a7e54eeef799484 100644 (file)
--- 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,7 +3,6 @@
 /* { 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 4d8e023fcf0faaca092a5ba8a8aefa8d0061d1c4..e4b49dc052f1021bc5884a2fd3932460f4d65dc0 100644 (file)
--- 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,7 +3,6 @@
 /* { 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 4d23cad71537564885feced08a5f8e6544b8763a..ae784a6353364f71a5d42dc70d49bf996ac93dbf 100644 (file)
--- 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,7 +3,6 @@
 /* { 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 cbe4c9135bff8987d6d35cd06e5e826a4eaf30c6..f82d9ee216f5f3a5b60f43484dca9d79b9e2efe0 100644 (file)
--- 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,7 +3,6 @@
 /* { 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 ea6f482eccdf82edfff62ec14fac7d132e64b2d1..6bdc55af5d9a580df64d2da2528bc8a800e82efd 100644 (file)
--- 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,7 +3,6 @@
 /* { 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 08358bbaf0626bffeda24b7135d86fcaaff2db60..5780f96500f17713856b998392dfb09ed34a8816 100644 (file)
--- 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,7 +3,6 @@
 /* { 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 2692c864886487b14522cff695cb3d72e73d01a4..a946ff85177ffc768cba761adb94ebd5865afa99 100644 (file)
--- 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,7 +3,6 @@
 /* { 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 a601511f2ced69568760fec822e3bfe73cd558cc..fee9644a50578c1f284763a2d658efe4466a96f3 100644 (file)
--- 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,7 +3,6 @@
 /* { 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" } */
 
 /**
  **