Skip to content

Instantly share code, notes, and snippets.

@captn3m0

captn3m0/README.md

Created June 24, 2024 06:55
Show Gist options
  • Save captn3m0/a7b9589266da65d7c19ba2c01901abcb to your computer and use it in GitHub Desktop.
Save captn3m0/a7b9589266da65d7c19ba2c01901abcb to your computer and use it in GitHub Desktop.
Download ZIP
Azul Zulu JDK Source Code Diff
Raw
diff.patch
diff -ruN ./addons/DISCLAIMER ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/addons/DISCLAIMER
--- ./addons/DISCLAIMER 1970-01-01 05:30:00.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/addons/DISCLAIMER 2024-04-05 13:41:17.000000000 +0530
@@ -0,0 +1,47 @@
+The copyrights in this software and any visual or audio work distributed with
+the software belong to Azul Systems, Inc. and those included in all other notice
+files either listed in the readme file or contained in any other included notice
+files with this distribution. All rights are reserved. Installation of this
+software and any Azul software bundled with or derived from this software is
+licensed only in accordance with these terms.
+
+Provided you have not received the software directly from Azul and have already
+agreed to the terms of a separate license agreement, by installing, using or
+distributing this software you, on your own behalf and on behalf of your
+employer or principal, agree to be bound by these terms. If you do not agree to
+any of these terms, you may not use, copy, transmit, distribute nor install this
+software.
+
+The software is developed and owned by Azul and/or any of its affiliates,
+subsidiaries or respective suppliers and licensors. The software also includes
+certain software components and materials ("Open Source Materials") of third
+parties ("Third Party Licensors") licensed under certain licenses ("Open Source
+Licenses").
+
+Nothing in this Agreement limits your rights under, or grants you rights that
+supersede the terms and conditions of any applicable Open Source Licenses.
+You must review the Open Source Licenses located at
+http://www.azulsystems.com/license/zulu_third_party_licenses.html
+to understand your rights under them. In the event that no such third party
+license agreements exist, the restrictions contained in this Agreement shall
+apply.
+
+With respect to the Open Source Licenses the following shall apply:
+
+ 1) You hereby acknowledge and agree that you will be licensing any Open Source
+ Materials directly from the applicable Third Party Licensors including the
+ right to use such Third Party Materials in connection with the software
+
+ 2) In the event of any inconsistencies or conflicting provisions of the Open
+ Source Licenses and the provisions of this Agreement, the provisions of the
+ Open Source Licenses shall prevail.
+
+THIS SOFTWARE IS PROVIDED BY AZUL "AS-IS" AND WITHOUT EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL AZUL
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY OR
+CONSEQUENTIAL DAMAGES (INCLUDING BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICE, LOSS OF USE, DATA OR PROFITS; OR BUSINESS INTERRUPTION,
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY WHETHER IN CONTRACT, STRICT
+LIABILITY OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -ruN ./addons/README.JAVASE ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/addons/README.JAVASE
--- ./addons/README.JAVASE 1970-01-01 05:30:00.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/addons/README.JAVASE 2024-04-05 13:41:17.000000000 +0530
@@ -0,0 +1 @@
+This is an intermediate build made available for testing purposes only. The code is untested and presumed incompatible with the Java SE Specification. You should not deploy or write to this code, but instead use a tested and certified Java SE compatible version of the code. Redistribution of this build must retain this notice.
diff -ruN ./addons/readme.txt ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/addons/readme.txt
--- ./addons/readme.txt 1970-01-01 05:30:00.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/addons/readme.txt 2024-06-21 19:01:42.000000000 +0530
@@ -0,0 +1,19 @@
+
+
+ Certain portions of this software are based on source code from OpenJDK
+(http://openjdk.java.net/) and licensed under the GNU General Public
+License version 2 (GPLv2) with the Classpath Exception (http://
+openjdk.java.net/legal/gplv2+ce.html). For a period of three years from
+the date of your receipt of this software, Azul will provide upon
+request, a complete machine readable copy of the source code for such
+portions based on OpenJDK on a medium customarily used for software
+interchange for a charge no more than the cost of physically performing
+source distribution.
+
+
+ Please email [email protected] for further information.
+
+ Include this version code in your email:
+ Zulu 22.30+13 995dc5ae-77a7-4214-80fb-da03dc88f946
+
+To learn more about Azul products, visit https://www.azul.com/modern-cloud-enterprise/?r=zulu
diff -ruN ./addons/Welcome.html ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/addons/Welcome.html
--- ./addons/Welcome.html 1970-01-01 05:30:00.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/addons/Welcome.html 2024-04-05 13:41:17.000000000 +0530
@@ -0,0 +1,22 @@
+<!doctype html>
+<html>
+ <head>
+ <title>
+ Welcome to Azul Zulu Builds of OpenJDK, the open Java(TM) platform from Azul.
+ </title>
+ </head>
+ <body>
+ <h2>Welcome to Azul Zulu Builds of OpenJDK, the open Java<sup><small>&trade;</small></sup> platform from Azul<sup><small>&reg;</small></sup></h2>
+ <p>The Azul Zulu environment includes the Java&trade; runtime, compiler, and tools. It provides complete runtime support for Java applications.
+ <p>To read more about Azul products visit <a href="https://www.azul.com/products/?r=zulu">Azul website</a>.</p>
+ <h3>Reference Documentation</h3>
+ <p>See the <a href="https://docs.azul.com/core/?r=zulu">Azul Zulu Builds of OpenJDK documentation</a> for more information on Azul Zulu installation, operation, and troubleshooting.
+ <p>See the <a href="https://docs.azul.com/core/zulu-openjdk/release-notes.html?r=zulu">Release Notes</a> for release details on Azul Zulu versions and system requirements.
+ <hr>
+ <small>
+ Copyright &copy; 2023-2024 <a href="https://www.azul.com/?r=zulu">Azul Systems</a>. All rights reserved.
+ </small>
+ <p>
+ </body>
+</html>
+
diff -ruN ./.branding ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/.branding
--- ./.branding 1970-01-01 05:30:00.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/.branding 2024-04-05 13:41:17.000000000 +0530
@@ -0,0 +1,8 @@
+JDK_TAG=jdk-22.0.1+8
+JDK_VERSION_DATE=2024-04-16
+
+ZULU_TAG=zulu-22.30+13
+
+ZULU_FEATURE_NUMBER=22
+ZULU_UPDATE_NUMBER=30
+ZULU_BUILD_NUMBER=13
diff -ruN ./CLASSPATH_EXCEPTION_NOTE ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/CLASSPATH_EXCEPTION_NOTE
--- ./CLASSPATH_EXCEPTION_NOTE 1970-01-01 05:30:00.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/CLASSPATH_EXCEPTION_NOTE 2024-04-05 13:41:17.000000000 +0530
@@ -0,0 +1,3 @@
+A “Classpath Exception File” means any source file contained in this distribution which contains the following words in such file’s header: “Oracle designates this particular file as subject to the "Classpath" exception as provided by Oracle in the LICENSE file that accompanied this code.”
+
+Azul Systems, Inc. hereby confirms that each Classpath Exception File is subject to the clarification and special exception to the GPL that is outlined in the accompanying LICENSE file (under the heading “‘CLASSPATH’ EXCEPTION TO THE GPL”).
diff -ruN ./.dependencies ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/.dependencies
--- ./.dependencies 1970-01-01 05:30:00.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/.dependencies 2024-04-05 13:41:17.000000000 +0530
@@ -0,0 +1,29 @@
+# Zulu build dependencies
+
+WITH_CRS=false
+
+WITH_JFX=https://nexus.azulsystems.com/repository/zulu-binaries/zulu/jfx/zulu-jfx-sdk-build/474
+
+WITH_OPENJSSE=false
+
+WITH_CACERTS=lastSuccessfulBuild
+
+WITH_FREETYPE=bundled
+
+BOOT_JDK_VERSION=21
+
+WITH_DEVKIT_WIN=VS2022-17.1.4+1.0
+WITH_DEVKIT_LINUX_X64=gcc-11.2.0-OL6.4+1.0
+WITH_DEVKIT_LINUX_X86=gcc-11.2.0-OL6.4+1.0
+WITH_DEVKIT_MACOSX=Xcode14.3-MacOSX13+1.0
+WITH_DEVKIT_MACOS_AARCH64=Xcode14.3-MacOSX13+1.0
+WITH_DEVKIT_LINUX_AARCH64=false
+PRODUCT_TOOLCHAIN_VERSION_LINUX_AARCH64=devtoolset-10
+
+BUILD_NODE_LINUX64=ubuntu-x86-docker-us-west-2:centos7-gcc-11.2.0-1.0
+BUILD_NODE_LINUX32=ubuntu-x86-docker-us-west-2:centos7-gcc-11.2.0-1.0
+BUILD_NODE_LINUX_AARCH64=ubuntu-arm64-docker-us-west-2:centos7-devtoolsets
+BUILD_NODE_LINUX_MUSL_X64=ubuntu-x86-docker-us-west-2:alpine3.11
+BUILD_NODE_LINUX_MUSL_AARCH64=ubuntu-arm64-docker-us-west-2:alpine3.11
+BUILD_NODE_MACOSX=zulu-build-macos13-arm-jdk
+BUILD_NODE_MACOS_AARCH64=zulu-build-macos13-arm-jdk
diff -ruN ./make/autoconf/configure.ac ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/autoconf/configure.ac
--- ./make/autoconf/configure.ac 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/autoconf/configure.ac 2024-04-05 13:41:17.000000000 +0530
@@ -89,6 +89,9 @@
BASIC_SETUP_TOOLS
BASIC_SETUP_BUILD_ENV
+# See if we are doing a refined build or not
+JDKOPT_SETUP_REFINED_BUILD
+
# Check if it's a pure open build or if custom sources are to be used.
JDKOPT_SETUP_OPEN_OR_CUSTOM
diff -ruN ./make/autoconf/jdk-options.m4 ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/autoconf/jdk-options.m4
--- ./make/autoconf/jdk-options.m4 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/autoconf/jdk-options.m4 2024-04-05 13:41:17.000000000 +0530
@@ -188,6 +188,9 @@
if test "x$OPENJDK_TARGET_CPU" = xs390x ; then
INCLUDE_SA=false
fi
+ if test "x$REFINED_BUILD" = "xtrue"; then
+ INCLUDE_SA=false
+ fi
AC_SUBST(INCLUDE_SA)
# Compress jars
@@ -553,6 +556,29 @@
])
################################################################################
+# Check if refined build feature should be enabled
+#
+AC_DEFUN_ONCE([JDKOPT_SETUP_REFINED_BUILD],
+[
+ AC_ARG_ENABLE([refined-build], [AS_HELP_STRING([--enable-refined-build],
+ [enable refined build @<:@disabled@:>@])])
+
+ REFINED_BUILD=false
+ if test "x$enable_refined_build" = "xyes"; then
+ AC_MSG_CHECKING([if refined build is enabled])
+ AC_MSG_RESULT([yes])
+ REFINED_BUILD=true
+ elif test "x$enable_refined_build" = "xno"; then
+ AC_MSG_CHECKING([if refined build is enabled])
+ AC_MSG_RESULT([no])
+ elif test "x$enable_refined_build" != "x"; then
+ AC_MSG_ERROR([--enable-refined-build can only be assigned "yes" or "no"])
+ fi
+
+ AC_SUBST(REFINED_BUILD)
+])
+
+################################################################################
#
# jmod options.
#
diff -ruN ./make/autoconf/jvm-features.m4 ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/autoconf/jvm-features.m4
--- ./make/autoconf/jvm-features.m4 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/autoconf/jvm-features.m4 2024-04-05 13:41:17.000000000 +0530
@@ -277,7 +277,11 @@
[
JVM_FEATURES_CHECK_AVAILABILITY(jvmci, [
AC_MSG_CHECKING([if platform is supported by JVMCI])
- if test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
+
+ if test "x$REFINED_BUILD" = "xtrue"; then
+ AC_MSG_RESULT([no, refined sources, jvmci is not supported])
+ AVAILABLE=false
+ elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
AC_MSG_RESULT([yes])
elif test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
AC_MSG_RESULT([yes])
diff -ruN ./make/autoconf/spec.gmk.in ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/autoconf/spec.gmk.in
--- ./make/autoconf/spec.gmk.in 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/autoconf/spec.gmk.in 2024-04-05 13:41:17.000000000 +0530
@@ -850,6 +850,7 @@
INCLUDE_SA := @INCLUDE_SA@
INCLUDE_JVMCI := @INCLUDE_JVMCI@
INCLUDE_COMPILER2 := @INCLUDE_COMPILER2@
+REFINED_BUILD := @REFINED_BUILD@
OS_VERSION_MAJOR := @OS_VERSION_MAJOR@
OS_VERSION_MINOR := @OS_VERSION_MINOR@
diff -ruN ./make/devkit/appendDllVersions.sh ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/appendDllVersions.sh
--- ./make/devkit/appendDllVersions.sh 1970-01-01 05:30:00.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/appendDllVersions.sh 2024-04-05 13:41:17.000000000 +0530
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+DEVKIT_ROOT=$1
+
+if ! which verpatch; then
+ echo "Failed to locate verpatch"
+ exit 1
+fi
+
+source ${DEVKIT_ROOT}/devkit.info
+
+echo-info() {
+ echo "$1" >> $DEVKIT_ROOT/devkit.info
+}
+
+log-entry() {
+ file=$1
+ comp=$2
+ arch=$3
+ dosName=`cygpath -d $file`
+ ver=`verpatch.exe /vo ${dosName} | grep ProductVersion | rev | cut -d' ' -f1 | rev`
+
+ baseName=$(basename ${file/.dll/})
+ keyName="dll_${comp}_${arch}_${baseName//-/_}_version"
+
+ echo-info "${keyName^^}=$ver"
+}
+
+echo-info ""
+echo-info "# Versions of redist files (Runtime/UCRT) as they may differ from the declared versions"
+
+# check vars/places defined in devkit.info
+log-entry $DEVKIT_MSVCR_DLL_x86 runtime x86
+log-entry $DEVKIT_MSVCP_DLL_x86 runtime x86
+for file in $DEVKIT_UCRT_DLL_DIR_x86/*; do
+ log-entry $file ucrt x86
+done
+
+log-entry $DEVKIT_MSVCR_DLL_x86_64 runtime x86_64
+[ -f "$DEVKIT_VCRUNTIME_1_DLL_x86_64" ] && log-entry $DEVKIT_VCRUNTIME_1_DLL_x86_64 runtime x86_64
+log-entry $DEVKIT_MSVCP_DLL_x86_64 runtime x86_64
+for file in $DEVKIT_UCRT_DLL_DIR_x86_64/*; do
+ log-entry $file ucrt x86_64
+done
+
+log-entry $DEVKIT_MSVCR_DLL_aarch64 runtime aarch64
+[ -f "$DEVKIT_VCRUNTIME_1_DLL_aarch64" ] && log-entry $DEVKIT_VCRUNTIME_1_DLL_aarch64 runtime aarch64
+log-entry $DEVKIT_MSVCP_DLL_aarch64 runtime aarch64
+if [ -d "$DEVKIT_UCRT_DLL_DIR_aarch64" ]; then
+ for file in $DEVKIT_UCRT_DLL_DIR_aarch64/*; do
+ log-entry $file ucrt aarch64
+ done
+fi
+
+echo "Versions:"
+cat $DEVKIT_ROOT/devkit.info | grep _VERSION | cut -d'=' -f2 | sort -u
diff -ruN ./make/devkit/createMacosxDevkit.sh ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/createMacosxDevkit.sh
--- ./make/devkit/createMacosxDevkit.sh 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/createMacosxDevkit.sh 2024-04-05 13:41:17.000000000 +0530
@@ -32,7 +32,7 @@
# "open Xcode_9.2.xip" in a terminal.
# [email protected]
-USAGE="$0 <Xcode.app>"
+USAGE="$0 <Xcode.app> <devkit-rev>"
if [ "$1" = "" ]; then
echo $USAGE
@@ -41,6 +41,7 @@
XCODE_APP="$1"
XCODE_APP_DIR_NAME="${XCODE_APP##*/}"
+DEVKIT_REV="$2"
SCRIPT_DIR="$(cd "$(dirname $0)" > /dev/null && pwd)"
BUILD_DIR="${SCRIPT_DIR}/../../build/devkit"
@@ -51,7 +52,7 @@
SDK_VERSION="$(ls $XCODE_APP/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs \
| grep [0-9] | sort -r | head -n1 | sed 's/\.sdk//')"
-DEVKIT_ROOT="${BUILD_DIR}/Xcode${XCODE_VERSION}-${SDK_VERSION}"
+DEVKIT_ROOT="${BUILD_DIR}/Xcode${XCODE_VERSION}-${SDK_VERSION}+${DEVKIT_REV}-devkit"
DEVKIT_BUNDLE="${DEVKIT_ROOT}.tar.gz"
echo "Xcode version: $XCODE_VERSION"
diff -ruN ./make/devkit/createWindowsDevkit.sh ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/createWindowsDevkit.sh
--- ./make/devkit/createWindowsDevkit.sh 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/createWindowsDevkit.sh 2024-04-05 13:41:17.000000000 +0530
@@ -35,7 +35,7 @@
# [email protected]
usage_and_exit() {
- echo "Usage: createWindowsDevkit.sh <2019 | 2022>"
+ echo "Usage: createWindowsDevkit.sh <2017 | 2019 | 2022>"
exit 1
}
@@ -80,12 +80,16 @@
PROGRAMFILES="$($WINDOWS_PATH_TO_UNIX_PATH "$PROGRAMFILES")"
case $VS_VERSION in
+ 2017)
+ MSVC_PROGRAMFILES_DIR="${PROGRAMFILES_X86}"
+ MSVC_CRT_DIR="Microsoft.VC141.CRT"
+ VS_VERSION_NUM_NODOT="150"
+ ;;
2019)
MSVC_PROGRAMFILES_DIR="${PROGRAMFILES_X86}"
MSVC_CRT_DIR="Microsoft.VC142.CRT"
VS_VERSION_NUM_NODOT="160"
;;
-
2022)
MSVC_PROGRAMFILES_DIR="${PROGRAMFILES}"
MSVC_CRT_DIR="Microsoft.VC143.CRT"
@@ -174,8 +178,8 @@
cp $DEVKIT_ROOT/VC/redist/x86/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/x86
cp $DEVKIT_ROOT/VC/redist/x64/$MSVCR_DLL $DEVKIT_ROOT/VC/bin/x64
cp $DEVKIT_ROOT/VC/redist/x64/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/x64
-cp $DEVKIT_ROOT/VC/redist/arm64/$MSVCR_DLL $DEVKIT_ROOT/VC/bin/arm64
-cp $DEVKIT_ROOT/VC/redist/arm64/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/arm64
+#cp $DEVKIT_ROOT/VC/redist/arm64/$MSVCR_DLL $DEVKIT_ROOT/VC/bin/arm64
+#cp $DEVKIT_ROOT/VC/redist/arm64/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/arm64
################################################################################
# Copy SDK files
@@ -263,6 +267,12 @@
cp $0 $DEVKIT_ROOT/
################################################################################
+# Append DLL versions
+
+echo "Appending DLL versions..."
+source appendDllVersions.sh $DEVKIT_ROOT
+
+################################################################################
# Create bundle
echo "Creating bundle: $DEVKIT_BUNDLE"
diff -ruN ./make/devkit/patches/binutils-2.25.patch ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/patches/binutils-2.25.patch
--- ./make/devkit/patches/binutils-2.25.patch 1970-01-01 05:30:00.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/patches/binutils-2.25.patch 2024-04-05 13:41:17.000000000 +0530
@@ -0,0 +1,11 @@
+--- binutils-2.30/gold/options.h 2014-10-14 11:32:04.000000000 +0400
++++ binutils-2.30/gold/options.h 2022-03-09 22:19:15.758001614 +0300
+@@ -948,7 +948,7 @@
+ N_("Do not page align data, do not make text readonly"),
+ N_("Page align data, make text readonly"));
+
+- DEFINE_enable(new_dtags, options::EXACTLY_TWO_DASHES, '\0', true,
++ DEFINE_enable(new_dtags, options::EXACTLY_TWO_DASHES, '\0', false,
+ N_("Enable use of DT_RUNPATH and DT_FLAGS"),
+ N_("Disable use of DT_RUNPATH and DT_FLAGS"));
+
diff -ruN ./make/devkit/patches/binutils-2.30.patch ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/patches/binutils-2.30.patch
--- ./make/devkit/patches/binutils-2.30.patch 1970-01-01 05:30:00.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/patches/binutils-2.30.patch 2024-04-05 13:41:17.000000000 +0530
@@ -0,0 +1,11 @@
+--- binutils-2.30/gold/options.h 2022-03-01 23:01:17.180001611 +0300
++++ binutils-2.30/gold/options.h 2022-03-01 23:02:34.892001611 +0300
+@@ -826,7 +826,7 @@
+ N_("Do not create exception frame header"));
+
+ // Alphabetized under 'e' because the option is spelled --enable-new-dtags.
+- DEFINE_enable(new_dtags, options::EXACTLY_TWO_DASHES, '\0', true,
++ DEFINE_enable(new_dtags, options::EXACTLY_TWO_DASHES, '\0', false,
+ N_("Enable use of DT_RUNPATH"),
+ N_("Disable use of DT_RUNPATH"));
+
diff -ruN ./make/devkit/patches/binutils-2.32.patch ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/patches/binutils-2.32.patch
--- ./make/devkit/patches/binutils-2.32.patch 1970-01-01 05:30:00.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/patches/binutils-2.32.patch 2024-04-05 13:41:17.000000000 +0530
@@ -0,0 +1,11 @@
+--- binutils-2.32/gold/options.h 2022-03-01 23:01:17.180001611 +0300
++++ binutils-2.32/gold/options.h 2022-03-01 23:02:34.892001611 +0300
+@@ -826,7 +826,7 @@
+ N_("Do not create exception frame header"));
+
+ // Alphabetized under 'e' because the option is spelled --enable-new-dtags.
+- DEFINE_enable(new_dtags, options::EXACTLY_TWO_DASHES, '\0', true,
++ DEFINE_enable(new_dtags, options::EXACTLY_TWO_DASHES, '\0', false,
+ N_("Enable use of DT_RUNPATH"),
+ N_("Disable use of DT_RUNPATH"));
+
diff -ruN ./make/devkit/patches/binutils-2.34.patch ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/patches/binutils-2.34.patch
--- ./make/devkit/patches/binutils-2.34.patch 1970-01-01 05:30:00.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/patches/binutils-2.34.patch 2024-04-05 13:41:17.000000000 +0530
@@ -0,0 +1,11 @@
+--- binutils-2.32/gold/options.h 2022-03-01 23:01:17.180001611 +0300
++++ binutils-2.32/gold/options.h 2022-03-01 23:02:34.892001611 +0300
+@@ -826,7 +826,7 @@
+ N_("Do not create exception frame header"));
+
+ // Alphabetized under 'e' because the option is spelled --enable-new-dtags.
+- DEFINE_enable(new_dtags, options::EXACTLY_TWO_DASHES, '\0', true,
++ DEFINE_enable(new_dtags, options::EXACTLY_TWO_DASHES, '\0', false,
+ N_("Enable use of DT_RUNPATH"),
+ N_("Disable use of DT_RUNPATH"));
+
diff -ruN ./make/devkit/patches/binutils-2.35.patch ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/patches/binutils-2.35.patch
--- ./make/devkit/patches/binutils-2.35.patch 1970-01-01 05:30:00.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/patches/binutils-2.35.patch 2024-04-05 13:41:17.000000000 +0530
@@ -0,0 +1,11 @@
+--- binutils-2.32/gold/options.h 2022-03-01 23:01:17.180001611 +0300
++++ binutils-2.32/gold/options.h 2022-03-01 23:02:34.892001611 +0300
+@@ -826,7 +826,7 @@
+ N_("Do not create exception frame header"));
+
+ // Alphabetized under 'e' because the option is spelled --enable-new-dtags.
+- DEFINE_enable(new_dtags, options::EXACTLY_TWO_DASHES, '\0', true,
++ DEFINE_enable(new_dtags, options::EXACTLY_TWO_DASHES, '\0', false,
+ N_("Enable use of DT_RUNPATH"),
+ N_("Disable use of DT_RUNPATH"));
+
diff -ruN ./make/devkit/patches/binutils-2.36.1.patch ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/patches/binutils-2.36.1.patch
--- ./make/devkit/patches/binutils-2.36.1.patch 1970-01-01 05:30:00.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/patches/binutils-2.36.1.patch 2024-04-05 13:41:17.000000000 +0530
@@ -0,0 +1,11 @@
+--- binutils-2.32/gold/options.h 2022-03-01 23:01:17.180001611 +0300
++++ binutils-2.32/gold/options.h 2022-03-01 23:02:34.892001611 +0300
+@@ -826,7 +826,7 @@
+ N_("Do not create exception frame header"));
+
+ // Alphabetized under 'e' because the option is spelled --enable-new-dtags.
+- DEFINE_enable(new_dtags, options::EXACTLY_TWO_DASHES, '\0', true,
++ DEFINE_enable(new_dtags, options::EXACTLY_TWO_DASHES, '\0', false,
+ N_("Enable use of DT_RUNPATH"),
+ N_("Disable use of DT_RUNPATH"));
+
diff -ruN ./make/devkit/patches/binutils-2.37.patch ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/patches/binutils-2.37.patch
--- ./make/devkit/patches/binutils-2.37.patch 1970-01-01 05:30:00.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/patches/binutils-2.37.patch 2024-04-05 13:41:17.000000000 +0530
@@ -0,0 +1,11 @@
+--- binutils-2.32/gold/options.h 2022-03-01 23:01:17.180001611 +0300
++++ binutils-2.32/gold/options.h 2022-03-01 23:02:34.892001611 +0300
+@@ -826,7 +826,7 @@
+ N_("Do not create exception frame header"));
+
+ // Alphabetized under 'e' because the option is spelled --enable-new-dtags.
+- DEFINE_enable(new_dtags, options::EXACTLY_TWO_DASHES, '\0', true,
++ DEFINE_enable(new_dtags, options::EXACTLY_TWO_DASHES, '\0', false,
+ N_("Enable use of DT_RUNPATH"),
+ N_("Disable use of DT_RUNPATH"));
+
diff -ruN ./make/devkit/patches/systemtap.patch ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/patches/systemtap.patch
--- ./make/devkit/patches/systemtap.patch 1970-01-01 05:30:00.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/patches/systemtap.patch 2024-04-05 13:41:17.000000000 +0530
@@ -0,0 +1,3 @@
+142a143,144
+> #elif defined __i386__
+> # define _SDT_ARGTMPL(id) %w[id] /* gcc.gnu.org/PR80115 */
diff -ruN ./make/devkit/Tools.gmk ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/Tools.gmk
--- ./make/devkit/Tools.gmk 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/devkit/Tools.gmk 2024-04-05 13:41:17.000000000 +0530
@@ -556,6 +556,7 @@
--with-mpfr=$(PREFIX) \
--with-gmp=$(PREFIX) \
--with-mpc=$(PREFIX) \
+ --enable-linker-build-id \
) > $(@D)/log.config 2>&1
@echo 'done'
diff -ruN ./make/Images.gmk ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/Images.gmk
--- ./make/Images.gmk 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/Images.gmk 2024-04-05 13:41:17.000000000 +0530
@@ -45,7 +45,7 @@
$(eval $(call ReadImportMetaData))
JRE_MODULES += $(filter $(ALL_MODULES), $(BOOT_MODULES) \
- $(PLATFORM_MODULES) jdk.jdwp.agent)
+ $(PLATFORM_MODULES) jdk.jdwp.agent jdk.random)
JDK_MODULES += $(ALL_MODULES)
JRE_MODULES_LIST := $(call CommaList, $(JRE_MODULES))
diff -ruN ./make/modules/java.base/Copy.gmk ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/modules/java.base/Copy.gmk
--- ./make/modules/java.base/Copy.gmk 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/make/modules/java.base/Copy.gmk 2024-04-05 13:41:17.000000000 +0530
@@ -219,6 +219,22 @@
################################################################################
#
+# Copy CPE note file for refined builds
+#
+JDK_CLASSPATH_EXCEPTION_NOTE ?= $(wildcard $(TOPDIR)/CLASSPATH_EXCEPTION_NOTE)
+
+ifeq ($(REFINED_BUILD), true)
+ $(eval $(call SetupCopyFiles, COPY_CPE_NOTE, \
+ FILES := $(JDK_CLASSPATH_EXCEPTION_NOTE), \
+ DEST := $(COMMON_LEGAL_DST_DIR), \
+ FLATTEN := true, \
+ ))
+
+ TARGETS += $(COPY_CPE_NOTE)
+endif
+
+################################################################################
+#
# Copy and filter the legal files depending on what 3rd party components are
# bundled or linked from the OS.
#
diff -ruN ./readme.txt ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/readme.txt
--- ./readme.txt 1970-01-01 05:30:00.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/readme.txt 2024-06-21 19:01:42.000000000 +0530
@@ -0,0 +1,19 @@
+
+
+ Certain portions of this software are based on source code from OpenJDK
+(http://openjdk.java.net/) and licensed under the GNU General Public
+License version 2 (GPLv2) with the Classpath Exception (http://
+openjdk.java.net/legal/gplv2+ce.html). For a period of three years from
+the date of your receipt of this software, Azul will provide upon
+request, a complete machine readable copy of the source code for such
+portions based on OpenJDK on a medium customarily used for software
+interchange for a charge no more than the cost of physically performing
+source distribution.
+
+
+ Please email [email protected] for further information.
+
+ Include this version code in your email:
+ Zulu 22.30+13 995dc5ae-77a7-4214-80fb-da03dc88f946
+
+To learn more about Azul products, visit https://www.azul.com/modern-cloud-enterprise/?r=zulu
diff -ruN ./src/hotspot/cpu/aarch64/immediate_aarch64.cpp ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/hotspot/cpu/aarch64/immediate_aarch64.cpp
--- ./src/hotspot/cpu/aarch64/immediate_aarch64.cpp 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/hotspot/cpu/aarch64/immediate_aarch64.cpp 2024-04-05 13:41:17.000000000 +0530
@@ -335,8 +335,10 @@
// constructor to initialise the lookup tables
static void initLITables();
-// Use an empty struct with a constructor as MSVC doesn't support `__attribute__ ((constructor))`
-// See https://stackoverflow.com/questions/1113409/attribute-constructor-equivalent-in-vc
+// The original code declared the function with the constructor attribute
+// static void initLITables() __attribute__ ((constructor));
+// MSVC doesn't support it and so it can't be used for WinAArch64 port
+// Use an empty struct with a constructor calling the function at library load time
static struct initLITables_t { initLITables_t(void) { initLITables(); } } _initLITables;
static void initLITables()
{
diff -ruN ./src/hotspot/share/runtime/abstract_vm_version.cpp ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/hotspot/share/runtime/abstract_vm_version.cpp
--- ./src/hotspot/share/runtime/abstract_vm_version.cpp 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/hotspot/share/runtime/abstract_vm_version.cpp 2024-04-05 13:41:17.000000000 +0530
@@ -22,6 +22,12 @@
*
*/
+/*
+ * This file has been modified by Azul Systems, Inc. in 2019. These
+ * modifications are Copyright (c) 2019 Azul Systems, Inc., and are made
+ * available on the same license terms set forth above.
+ */
+
#include "precompiled.hpp"
#include "compiler/compilerDefinitions.hpp"
#include "jvm_io.h"
@@ -280,9 +286,15 @@
#define LIBC_STR ""
#endif
+ #ifndef VENDOR_VERSION_STRING
+ #define INTERNAL_JRE_INFO "(" VERSION_STRING ")"
+ #else
+ #define INTERNAL_JRE_INFO "(" VERSION_STRING ") (" VENDOR_VERSION_STRING ")"
+ #endif
+
#define INTERNAL_VERSION_SUFFIX VM_RELEASE ")" \
" for " OS "-" CPU FLOAT_ARCH_STR LIBC_STR \
- " JRE (" VERSION_STRING "), built on " HOTSPOT_BUILD_TIME \
+ " JRE " INTERNAL_JRE_INFO ", built on " HOTSPOT_BUILD_TIME \
" by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER
return strcmp(DEBUG_LEVEL, "release") == 0
diff -ruN ./src/hotspot/share/runtime/arguments.cpp ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/hotspot/share/runtime/arguments.cpp
--- ./src/hotspot/share/runtime/arguments.cpp 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/hotspot/share/runtime/arguments.cpp 2024-04-05 13:41:17.000000000 +0530
@@ -351,6 +351,9 @@
}
continue;
}
+ if (match_option(option, "-XX:+OverrideVMProperties", &tail)) {
+ FLAG_SET_CMDLINE(OverrideVMProperties, true);
+ }
}
}
@@ -362,10 +365,14 @@
// property. It is used to store the underlying boot class path.
_boot_class_path = new PathString(nullptr);
+ // If OverrideVMProperties is enabled, make the properties writeable.
+ // This may be needed to appease some tools.
+ const bool writable = OverrideVMProperties;
+
PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.name",
- "Java Virtual Machine Specification", false));
- PropertyList_add(&_system_properties, new SystemProperty("java.vm.version", VM_Version::vm_release(), false));
- PropertyList_add(&_system_properties, new SystemProperty("java.vm.name", VM_Version::vm_name(), false));
+ "Java Virtual Machine Specification", writable));
+ PropertyList_add(&_system_properties, new SystemProperty("java.vm.version", VM_Version::vm_release(), writable));
+ PropertyList_add(&_system_properties, new SystemProperty("java.vm.name", VM_Version::vm_name(), writable));
PropertyList_add(&_system_properties, new SystemProperty("jdk.debug", VM_Version::jdk_debug_level(), false));
// Initialize the vm.info now, but it will need updating after argument parsing.
@@ -405,12 +412,16 @@
jio_snprintf(buffer, bufsz, UINT32_FORMAT, spec_version);
+ // If OverrideVMProperties is enabled, make the properties writeable.
+ // This may be needed to appease some tools.
+ const bool writable = OverrideVMProperties;
+
PropertyList_add(&_system_properties,
- new SystemProperty("java.vm.specification.vendor", spec_vendor, false));
+ new SystemProperty("java.vm.specification.vendor", spec_vendor, writable));
PropertyList_add(&_system_properties,
- new SystemProperty("java.vm.specification.version", buffer, false));
+ new SystemProperty("java.vm.specification.version", buffer, writable));
PropertyList_add(&_system_properties,
- new SystemProperty("java.vm.vendor", VM_Version::vm_vendor(), false));
+ new SystemProperty("java.vm.vendor", VM_Version::vm_vendor(), writable));
}
/*
diff -ruN ./src/hotspot/share/runtime/globals.hpp ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/hotspot/share/runtime/globals.hpp
--- ./src/hotspot/share/runtime/globals.hpp 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/hotspot/share/runtime/globals.hpp 2024-04-05 13:41:17.000000000 +0530
@@ -22,6 +22,12 @@
*
*/
+/*
+ * This file has been modified by Azul Systems, Inc. in 2019. These
+ * modifications are Copyright (c) 2019 Azul Systems, Inc., and are made
+ * available on the same license terms set forth above.
+ */
+
#ifndef SHARE_RUNTIME_GLOBALS_HPP
#define SHARE_RUNTIME_GLOBALS_HPP
@@ -1797,6 +1803,9 @@
product(bool, PrintConcurrentLocks, false, MANAGEABLE, \
"Print java.util.concurrent locks in thread dump") \
\
+ product(bool, OverrideVMProperties, false, \
+ "Allow modifications to immutable VM properties") \
+ \
product(bool, PrintMethodHandleStubs, false, DIAGNOSTIC, \
"Print generated stub code for method handles") \
\
diff -ruN ./src/hotspot/share/runtime/vm_version.cpp ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/hotspot/share/runtime/vm_version.cpp
--- ./src/hotspot/share/runtime/vm_version.cpp 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/hotspot/share/runtime/vm_version.cpp 2024-04-05 13:41:17.000000000 +0530
@@ -22,6 +22,12 @@
*
*/
+/*
+ * This file has been modified by Azul Systems, Inc. in 2019. These
+ * modifications are Copyright (c) 2019 Azul Systems, Inc., and are made
+ * available on the same license terms set forth above.
+ */
+
#include "precompiled.hpp"
#include "logging/log.hpp"
#include "logging/logStream.hpp"
diff -ruN ./src/hotspot/share/utilities/copy.cpp ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/hotspot/share/utilities/copy.cpp
--- ./src/hotspot/share/utilities/copy.cpp 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/hotspot/share/utilities/copy.cpp 2024-04-05 13:41:17.000000000 +0530
@@ -247,8 +247,10 @@
// This code is used by Unsafe and may hit the next page after truncation of mapped memory.
// Therefore, we use volatile to prevent compilers from replacing the loop by memset which
// may not trigger SIGBUS as needed (observed on Alpine Linux x86_64)
+ // Also making counter volatile to prevent compilers from generating strb with auto-increment
+ // Otherwise, it may trigger endless loop on Alpine Linux aarch64
jbyte fill = value;
- for (uintptr_t off = 0; off < size; off += sizeof(jbyte)) {
+ for (volatile uintptr_t off = 0; off < size; off += sizeof(jbyte)) {
*(volatile jbyte*)(dst + off) = fill;
}
#else
diff -ruN ./src/java.desktop/share/legal/colorimaging.md ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/java.desktop/share/legal/colorimaging.md
--- ./src/java.desktop/share/legal/colorimaging.md 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/java.desktop/share/legal/colorimaging.md 2024-04-05 13:41:17.000000000 +0530
@@ -5,3 +5,14 @@
Portions Copyright Eastman Kodak Company 1991-2003
</pre>
+<pre>
+/* ****************************************************************
+ ******************************************************************
+ ******************************************************************
+ *** COPYRIGHT (c) Eastman Kodak Company, 1997
+ *** As an unpublished work pursuant to Title 17 of the United
+ *** States Code. All rights reserved.
+ ******************************************************************
+ ******************************************************************
+ ******************************************************************/
+</pre>
diff -ruN ./src/java.desktop/share/native/libharfbuzz/hb-cplusplus.hh ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/java.desktop/share/native/libharfbuzz/hb-cplusplus.hh
--- ./src/java.desktop/share/native/libharfbuzz/hb-cplusplus.hh 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/java.desktop/share/native/libharfbuzz/hb-cplusplus.hh 2024-04-05 13:41:17.000000000 +0530
@@ -190,8 +190,7 @@
} // namespace hb
/* Workaround for GCC < 7, see:
- * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480
- * https://stackoverflow.com/a/25594741 */
+ * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480 */
namespace std {
diff -ruN ./src/java.desktop/share/native/libharfbuzz/hb-null.hh ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/java.desktop/share/native/libharfbuzz/hb-null.hh
--- ./src/java.desktop/share/native/libharfbuzz/hb-null.hh 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/java.desktop/share/native/libharfbuzz/hb-null.hh 2024-04-05 13:41:17.000000000 +0530
@@ -63,10 +63,6 @@
* The main purpose of this is to let structs communicate that they are not nullable,
* by defining min_size but *not* null_size. */
-/* The hard way...
- * https://stackoverflow.com/questions/7776448/sfinae-tried-with-bool-gives-compiler-error-template-argument-tvalue-invol
- */
-
template <typename T, typename>
struct _hb_null_size : hb_integral_constant<unsigned, sizeof (T)> {};
template <typename T>
diff -ruN ./src/java.desktop/share/native/libharfbuzz/hb-string-array.hh ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/java.desktop/share/native/libharfbuzz/hb-string-array.hh
--- ./src/java.desktop/share/native/libharfbuzz/hb-string-array.hh 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/java.desktop/share/native/libharfbuzz/hb-string-array.hh 2024-04-05 13:41:17.000000000 +0530
@@ -43,7 +43,6 @@
struct {
/* I like to avoid storing the nul-termination byte since we don't need it,
* but C++ does not allow that.
- * https://stackoverflow.com/q/28433862
*/
#define _S(s) char HB_PASTE (str, __LINE__)[sizeof (s)];
#include HB_STRING_ARRAY_LIST
diff -ruN ./src/java.desktop/share/native/libharfbuzz/OT/glyf/path-builder.hh ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/java.desktop/share/native/libharfbuzz/OT/glyf/path-builder.hh
--- ./src/java.desktop/share/native/libharfbuzz/OT/glyf/path-builder.hh 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/java.desktop/share/native/libharfbuzz/OT/glyf/path-builder.hh 2024-04-05 13:41:17.000000000 +0530
@@ -32,9 +32,6 @@
font (font_), draw_session (&draw_session_) {}
/* based on https://github.com/RazrFalcon/ttf-parser/blob/4f32821/src/glyf.rs#L287
- See also:
- * https://developer.apple.com/fonts/TrueType-Reference-Manual/RM01/Chap1.html
- * https://stackoverflow.com/a/20772557
*
* Cubic support added. */
HB_ALWAYS_INLINE
diff -ruN ./src/jdk.jfr/share/classes/jdk/jfr/events/StackFilter.java ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/jdk.jfr/share/classes/jdk/jfr/events/StackFilter.java
--- ./src/jdk.jfr/share/classes/jdk/jfr/events/StackFilter.java 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/jdk.jfr/share/classes/jdk/jfr/events/StackFilter.java 2024-04-05 13:41:17.000000000 +0530
@@ -1,3 +1,28 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * 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
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
package jdk.jfr.events;
import java.lang.annotation.ElementType;
diff -ruN ./src/jdk.jfr/share/classes/jdk/jfr/internal/test/DeprecatedMethods.java ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/jdk.jfr/share/classes/jdk/jfr/internal/test/DeprecatedMethods.java
--- ./src/jdk.jfr/share/classes/jdk/jfr/internal/test/DeprecatedMethods.java 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/jdk.jfr/share/classes/jdk/jfr/internal/test/DeprecatedMethods.java 2024-04-05 13:41:17.000000000 +0530
@@ -4,7 +4,9 @@
*
* 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
- * published by the Free Software Foundation.
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
diff -ruN ./src/jdk.jfr/share/classes/jdk/jfr/internal/test/DeprecatedThing.java ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/jdk.jfr/share/classes/jdk/jfr/internal/test/DeprecatedThing.java
--- ./src/jdk.jfr/share/classes/jdk/jfr/internal/test/DeprecatedThing.java 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/src/jdk.jfr/share/classes/jdk/jfr/internal/test/DeprecatedThing.java 2024-04-05 13:41:17.000000000 +0530
@@ -4,7 +4,9 @@
*
* 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
- * published by the Free Software Foundation.
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
diff -ruN ./.src-rev ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/.src-rev
--- ./.src-rev 1970-01-01 05:30:00.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/.src-rev 2024-06-21 19:01:38.000000000 +0530
@@ -0,0 +1 @@
+6b2620e57473404f2be666e61568f5875e440e75
diff -ruN ./test/jdk/tools/jlink/basic/AllModulePath.java ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/test/jdk/tools/jlink/basic/AllModulePath.java
--- ./test/jdk/tools/jlink/basic/AllModulePath.java 2024-03-12 16:00:23.000000000 +0530
+++ ../../zulu-995dc5ae-77a7-4214-80fb-da03dc88f946/test/jdk/tools/jlink/basic/AllModulePath.java 2024-04-05 13:41:17.000000000 +0530
@@ -96,7 +96,8 @@
Set<String> modules = new HashSet<>();
Files.find(JMODS, 1, (Path p, BasicFileAttributes attr) ->
- p.toString().endsWith(".jmod"))
+ p.toString().endsWith(".jmod"),
+ java.nio.file.FileVisitOption.FOLLOW_LINKS)
.map(p -> JMODS.relativize(p).toString())
.map(n -> n.substring(0, n.length()-5))
.forEach(modules::add);
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment