From c3ffa376820531a18066f08e989f6d722d1ff7a3 Mon Sep 17 00:00:00 2001
From: Peter Shipton <Peter_Shipton@ca.ibm.com>
Date: Tue, 12 Sep 2023 15:11:03 -0400
Subject: [PATCH] Use the system zlib on Linux platforms

This makes jdk8 consistent with jdk11+.

Issue https://github.com/eclipse-openj9/openj9/issues/18127

Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
---
 common/autoconf/generated-configure.sh          |  8 ++++----
 common/autoconf/libraries.m4                    |  6 +++---
 jdk/make/closed/autoconf/generated-configure.sh | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 51da35a3445..ce112b05bf9 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -4050,7 +4050,7 @@ fi
 #
 
 # ===========================================================================
-# (c) Copyright IBM Corp. 2021, 2022 All Rights Reserved
+# (c) Copyright IBM Corp. 2021, 2023 All Rights Reserved
 # ===========================================================================
 
 
@@ -4464,7 +4464,7 @@ VS_TOOLSET_SUPPORTED_2022=true
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1692401469
+DATE_WHEN_GENERATED=1694545593
 
 ###############################################################################
 #
@@ -46346,9 +46346,9 @@ fi
 $as_echo_n "checking for which zlib to use... " >&6; }
 
   DEFAULT_ZLIB=bundled
-  if test "x$OPENJDK_TARGET_OS" = xmacosx -o "x$OPENJDK_TARGET_OS" = xaix; then
+  if test "x$OPENJDK_TARGET_OS" = xmacosx -o "x$OPENJDK_TARGET_OS" = xaix -o "x$OPENJDK_TARGET_OS" = xlinux; then
     #
-    # On macosx and aix default is system...on others default is
+    # On macosx, aix, and linux default is system...on others default is
     #
     DEFAULT_ZLIB=system
   fi
diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
index 669fccf8120..f83973aa2b4 100644
--- a/common/autoconf/libraries.m4
+++ b/common/autoconf/libraries.m4
@@ -24,7 +24,7 @@
 #
 
 # ===========================================================================
-# (c) Copyright IBM Corp. 2021, 2022 All Rights Reserved
+# (c) Copyright IBM Corp. 2021, 2023 All Rights Reserved
 # ===========================================================================
 
 AC_DEFUN_ONCE([LIB_SETUP_INIT],
@@ -668,9 +668,9 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
   AC_MSG_CHECKING([for which zlib to use])
 
   DEFAULT_ZLIB=bundled
-  if test "x$OPENJDK_TARGET_OS" = xmacosx -o "x$OPENJDK_TARGET_OS" = xaix; then
+  if test "x$OPENJDK_TARGET_OS" = xmacosx -o "x$OPENJDK_TARGET_OS" = xaix -o "x$OPENJDK_TARGET_OS" = xlinux; then
     #
-    # On macosx and aix default is system...on others default is
+    # On macosx, aix, and linux default is system...on others default is
     #
     DEFAULT_ZLIB=system
   fi
diff --git a/jdk/make/closed/autoconf/generated-configure.sh b/jdk/make/closed/autoconf/generated-configure.sh
index 1a535edcc4e..31bc4381d43 100644
--- a/jdk/make/closed/autoconf/generated-configure.sh
+++ b/jdk/make/closed/autoconf/generated-configure.sh
@@ -4155,7 +4155,7 @@ fi
 #
 
 # ===========================================================================
-# (c) Copyright IBM Corp. 2021, 2022 All Rights Reserved
+# (c) Copyright IBM Corp. 2021, 2023 All Rights Reserved
 # ===========================================================================
 
 
@@ -4567,7 +4567,7 @@ VS_TOOLSET_SUPPORTED_2022=true
 # definitions. It is replaced with custom functionality when building
 # custom sources.
 # ===========================================================================
-# (c) Copyright IBM Corp. 2017, 2022 All Rights Reserved
+# (c) Copyright IBM Corp. 2017, 2023 All Rights Reserved
 # ===========================================================================
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
@@ -4634,7 +4634,7 @@ VS_TOOLSET_SUPPORTED_2022=true
 
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1692401469
+DATE_WHEN_GENERATED=1694545593
 
 ###############################################################################
 #
@@ -49317,9 +49317,9 @@ fi
 $as_echo_n "checking for which zlib to use... " >&6; }
 
   DEFAULT_ZLIB=bundled
-  if test "x$OPENJDK_TARGET_OS" = xmacosx -o "x$OPENJDK_TARGET_OS" = xaix; then
+  if test "x$OPENJDK_TARGET_OS" = xmacosx -o "x$OPENJDK_TARGET_OS" = xaix -o "x$OPENJDK_TARGET_OS" = xlinux; then
     #
-    # On macosx and aix default is system...on others default is
+    # On macosx, aix, and linux default is system...on others default is
     #
     DEFAULT_ZLIB=system
   fi