From 318cb6c4b1b5efdb21cb9a5f540428434c45c8b9 Mon Sep 17 00:00:00 2001
From: OpenJDK Team <openjdk-21@packages.debian.org>
Date: Sat, 15 Mar 2025 08:27:31 +0100
Subject: [PATCH] s390x-opt

Gbp-Pq: Name s390x-opt.diff
---
 make/autoconf/flags-cflags.m4 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index 1aa827b61..ad4b44f87 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -821,6 +821,9 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
       fi
     elif test "x$FLAGS_CPU" = xs390x; then
       $1_CFLAGS_CPU="-mbackchain -march=z10"
+      if test "x$VENDOR_FLAGS_CPU" != x; then
+        $1_CFLAGS_CPU="-mbackchain $VENDOR_FLAGS_CPU"
+      fi
     fi
 
     if test "x$FLAGS_CPU_ARCH" != xarm &&  test "x$FLAGS_CPU_ARCH" != xppc; then
-- 
2.30.2