From: Andreas Krebbel <krebbel@linux.ibm.com>
Date: Mon, 22 Apr 2024 09:07:43 +0000 (+0200)
Subject: s390x: Do not default to -mvx for -mesa
X-Git-Tag: basepoints/gcc-15~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b7785fdf95d179209f7277dd0ef912562130a39;p=thirdparty%2Fgcc.git

s390x: Do not default to -mvx for -mesa

We currently enable the vector extensions also for -march=z13 -m31
-mesa which is very wrong.

gcc/ChangeLog:

	* config/s390/s390.cc (s390_option_override_internal): Check zarch
	flag before enabling -mvx.
---

diff --git a/gcc/config/s390/s390.cc b/gcc/config/s390/s390.cc
index bf46eab2d633..5968808fcb6e 100644
--- a/gcc/config/s390/s390.cc
+++ b/gcc/config/s390/s390.cc
@@ -16104,7 +16104,7 @@ s390_option_override_internal (struct gcc_options *opts,
     }
   else
     {
-      if (TARGET_CPU_VX_P (opts))
+      if (TARGET_CPU_VX_P (opts) && TARGET_ZARCH_P (opts->x_target_flags))
 	/* Enable vector support if available and not explicitly disabled
 	   by user.  E.g. with -m31 -march=z13 -mzarch */
 	opts->x_target_flags |= MASK_OPT_VX;