From 8b4ac29278830edfb6cdc6da3437d96e2b7fef27 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@openjdk.org>
Date: Mon, 3 Apr 2023 12:18:21 +0000
Subject: [PATCH 1/2] 8304871: Use default visibility for static library builds

Backport-of: f0dba218ac00c0c577400b4d864ba79a9938aef7
---
 make/autoconf/flags-cflags.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index ea1d62685db..96d68b587f1 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -641,7 +641,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   STATIC_LIBS_CFLAGS="-DSTATIC_BUILD=1"
   if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
     STATIC_LIBS_CFLAGS="$STATIC_LIBS_CFLAGS -ffunction-sections -fdata-sections \
-      -DJNIEXPORT='__attribute__((visibility(\"hidden\")))'"
+      -DJNIEXPORT='__attribute__((visibility(\"default\")))'"
   else
     STATIC_LIBS_CFLAGS="$STATIC_LIBS_CFLAGS -DJNIEXPORT="
   fi

From 7285983e57bfb368fbb87e235acf2dafc600a3ad Mon Sep 17 00:00:00 2001
From: J9 Build <j9build@ca.ibm.com>
Date: Mon, 10 Apr 2023 03:18:59 +0000
Subject: [PATCH 2/2] Update OPENJDK_TAG to merged level jdk-17.0.7+6

Signed-off-by: J9 Build <j9build@ca.ibm.com>
---
 closed/openjdk-tag.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/closed/openjdk-tag.gmk b/closed/openjdk-tag.gmk
index 8aff2f9ff01..bdfa6a909f5 100644
--- a/closed/openjdk-tag.gmk
+++ b/closed/openjdk-tag.gmk
@@ -1 +1 @@
-OPENJDK_TAG := jdk-17.0.7+5
+OPENJDK_TAG := jdk-17.0.7+6