From cb23e1791c31e8b347e11d6600e9536fc5e8f36d Mon Sep 17 00:00:00 2001
From: OpenJDK Team <openjdk-17@packages.debian.org>
Date: Thu, 26 Jan 2023 10:36:16 +0000
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 ea1d62685..58a9d7b6d 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -735,6 +735,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