[Committed] s390x: Do not default to -mvx for -mesa

Message ID 20240422091336.443637-1-krebbel@linux.ibm.com
State Committed
Commit 1b7785fdf95d179209f7277dd0ef912562130a39
Headers
Series [Committed] s390x: Do not default to -mvx for -mesa |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 warning Patch is already merged
linaro-tcwg-bot/tcwg_gcc_build--master-arm warning Patch is already merged

Commit Message

Andreas Krebbel April 22, 2024, 9:13 a.m. UTC
  We currently enable the vector extensions also for -march=z13 -m31
mesa which is very wrong.

Not a regression but an obvious fix, so I've committed it to mainline
now. Will have to cherry-pick it for stable branches as well.

gcc/ChangeLog:

	* config/s390/s390.cc (s390_option_override_internal): Check zarch
	flag before enabling -mvx.
---
 gcc/config/s390/s390.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Patch

diff --git a/gcc/config/s390/s390.cc b/gcc/config/s390/s390.cc
index bf46eab2d63..5968808fcb6 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;