Merge pull request #1707 from SAP/pr-jdk-24+3

Merge to tag jdk-24+3

.github/workflows/main.yml

@@ -153,7 +153,7 @@ jobs:
  apt-architecture: 'i386'
  # Some multilib libraries do not have proper inter-dependencies, so we have to
  # install their dependencies manually.
- apt-extra-packages: 'libfreetype-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libc6-i386 libgcc-s1:i386 libstdc++6:i386 libffi-dev:i386'
+ apt-extra-packages: 'libfreetype-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libffi-dev:i386'
  extra-conf-options: '--with-target-bits=32 --enable-fallback-linker --enable-libffi-bundling'
  configure-arguments: ${{ github.event.inputs.configure-arguments }}
  make-arguments: ${{ github.event.inputs.make-arguments }}

make/GenerateLinkOptData.gmk

@@ -62,14 +62,23 @@ ifeq ($(EXTERNAL_BUILDJDK), true)
  INTERIM_IMAGE_DIR := $(BUILD_JDK)
 endif
 
+# These are needed for deterministic classlist:
+# - The classlist can be influenced by locale. Always set it to en/US.
+# - Run with -Xint, as the compiler can speculatively resolve constant pool entries.
+# - ForkJoinPool parallelism can cause constant pool resolution to be non-deterministic.
+CLASSLIST_FILE_VM_OPTS = \
+ -Duser.language=en -Duser.country=US \
+ -Xint \
+ -Djava.util.concurrent.ForkJoinPool.common.parallelism=0
+
 # Save the stderr output of the command and print it along with stdout in case
 # something goes wrong.
 $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST_JAR)
  $(call MakeDir, $(LINK_OPT_DIR))
  $(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $@))
  $(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE)))
  $(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:[email protected] \
- -Duser.language=en -Duser.country=US \
+ $(CLASSLIST_FILE_VM_OPTS) \
  -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
  build.tools.classlist.HelloClasslist $(LOG_DEBUG)
  $(GREP) -v HelloClasslist [email protected] > [email protected]
@@ -79,7 +88,7 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
  $(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:[email protected] \
  -XX:[email protected] -XX:[email protected] \
  -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
- -Duser.language=en -Duser.country=US \
+ $(CLASSLIST_FILE_VM_OPTS) \
  --module-path $(SUPPORT_OUTPUTDIR)/classlist.jar \
  -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
  build.tools.classlist.HelloClasslist \

make/autoconf/flags-cflags.m4

@@ -502,12 +502,12 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
  elif test "x$TOOLCHAIN_TYPE" = xclang; then
  ALWAYS_DEFINES_JVM="-D_GNU_SOURCE"
  elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
- # Access APIs for Windows 8 and above
- # see https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt?view=msvc-170
- ALWAYS_DEFINES_JDK="-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0602 \
- -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DWIN32 -DIAL"
- ALWAYS_DEFINES_JVM="-DNOMINMAX -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0602 \
-  -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE"
+ # _WIN32_WINNT=0x0602 means access APIs for Windows 8 and above. See
+ # https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt?view=msvc-170
+ ALWAYS_DEFINES="-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0602 \
+ -D_CRT_DECLARE_NONSTDC_NAMES -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS"
+ ALWAYS_DEFINES_JDK="$ALWAYS_DEFINES -DWIN32 -DIAL"
+ ALWAYS_DEFINES_JVM="$ALWAYS_DEFINES -DNOMINMAX"
  fi
 
  ###############################################################################

make/autoconf/lib-tests.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 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
@@ -28,7 +28,7 @@
 ################################################################################
 
 # Minimum supported versions
-JTREG_MINIMUM_VERSION=7.3.1
+JTREG_MINIMUM_VERSION=7.4
 GTEST_MINIMUM_VERSION=1.14.0
 
 ###############################################################################

make/conf/github-actions.conf

@@ -26,7 +26,7 @@
 # Versions and download locations for dependencies used by GitHub Actions (GHA)
 
 GTEST_VERSION=1.14.0
-JTREG_VERSION=7.3.1+1
+JTREG_VERSION=7.4+1
 
 LINUX_X64_BOOT_JDK_EXT=tar.gz
 LINUX_X64_BOOT_JDK_URL=https://github.com/SAP/SapMachine/releases/download/sapmachine-22.0.1/sapmachine-jdk-22.0.1_linux-x64_bin.tar.gz

make/conf/jib-profiles.js

@@ -1184,9 +1184,9 @@ var getJibProfilesDependencies = function (input, common) {
  jtreg: {
  server: "jpg",
  product: "jtreg",
- version: "7.3.1",
+ version: "7.4",
  build_number: "1",
- file: "bundles/jtreg-7.3.1+1.zip",
+ file: "bundles/jtreg-7.4+1.zip",
  environment_name: "JT_HOME",
  environment_path: input.get("jtreg", "home_path") + "/bin",
  configure_args: "--with-jtreg=" + input.get("jtreg", "home_path"),

make/modules/java.desktop/lib/ClientLibraries.gmk

@@ -281,6 +281,7 @@ endif
 ifeq ($(USE_EXTERNAL_HARFBUZZ), true)
  LIBFONTMANAGER_EXTRA_SRC =
  LIBFONTMANAGER_LIBS += $(HARFBUZZ_LIBS)
+ LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
 else
  LIBFONTMANAGER_EXTRA_SRC = libharfbuzz
 

make/scripts/update_copyright_year.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -f
 
 #
-# Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 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
@@ -27,8 +27,10 @@
 # (Originally from xdono, Thanks!)
 
 #------------------------------------------------------------
-copyright="Copyright (c)"
+copyright="Copyright"
+copyright_symbol="(c)"
 company="Oracle"
+year=`date +%Y`
 #------------------------------------------------------------
 
 awk="awk"
@@ -49,66 +51,75 @@ rm -f -r ${tmp}
 mkdir -p ${tmp}
 total=0
 
-# Default or supplied company name
-if [ "$3" != "" ] ; then
- company="$3"
-fi
-
-# This year or supplied year
-if [ "$2" != "" ] ; then
- year="$2"
-else
- year=`date +%Y`
-fi
-
-# VCS select
-vcs="$1"
+usage="Usage: `basename "$0"` [-c company] [-y year] [-h|f]"
+Help()
+{
+ # Display Help
+ echo "Updates the Copyright year range in Git sources."
+ echo
+ echo "By default, the tool limits the processed changesets "
+ echo "to those in the current branch and the current year."
+ echo
+ echo "Note, cancelling the script will skip cleanup in /tmp."
+ echo
+ echo $usage
+ echo "options:"
+ echo "-c Specifies the company. Set to Oracle by default."
+ echo "-y Specifies the copyright year. Set to current year by default."
+ echo "-f Updates the copyright for all change sets in a given year,"
+ echo " as specified by -y."
+ echo "-h Print this help."
+ echo
+}
 
-if [ -z "$vcs" ] ; then
- git_found=false
- hg_found=false
+full_year=false
 
- [ -d "${this_script_dir}/../../.git" ] && git_found=true
- [ -d "${this_script_dir}/../../.hg" ] && hg_found=true
+# Process options
+while getopts "c:fhy:" option; do
+ case $option in
+ c) # supplied company year
+ company=${OPTARG}
+ ;;
+ f) # update all change sets in a full year
+ full_year=true
+ ;;
+ h) # display help
+ Help
+ exit 0
+ ;;
+ y) # supplied company year
+ year=${OPTARG}
+ ;;
+ \?) # illegal option
+ echo "$usage"
+ exit 1
+ ;;
+ esac
+done
 
- if [ "$git_found" == "true" ] && [ "$hg_found" == "false" ] ; then
- vcs="git"
- elif [ "$hg_found" == "true" ] && [ "$git_found" == "false" ] ; then
- vcs="hg"
+# VCS check
+git_found=false
+[ -d "${this_script_dir}/../../.git" ] && git_found=true
+if [ "$git_found" != "true" ]; then
+ echo "Error: Please execute script from within make/scripts."
+ exit 1
+else
+ echo "Using Git version control system"
+ vcs_status=(git ls-files -m)
+ if [ "$full_year" = "true" ]; then
+ vcs_list_changesets=(git log --no-merges --since="${year}-01-01T00:00:00Z" --until="${year}-12-31T23:59:59Z" --pretty=tformat:"%H")
  else
- echo "Error: could not auto-detect version control system"
- vcs=""
+ vcs_list_changesets=(git log --no-merges 'master..HEAD' --since="${year}-01-01T00:00:00Z" --until="${year}-12-31T23:59:59Z" --pretty=tformat:"%H")
  fi
+ vcs_changeset_message=(git log -1 --pretty=tformat:"%B") # followed by ${changeset}
+ vcs_changeset_files=(git diff-tree --no-commit-id --name-only -r) # followed by ${changeset}
 fi
 
-case "$vcs" in
- "git")
- echo "Using Git version control system"
- vcs_status=(git ls-files -m)
- vcs_list_changesets=(git log --no-merges --since="${year}-01-01T00:00:00Z" --until="${year}-12-31T23:59:59Z" --pretty=tformat:"%H")
- vcs_changeset_message=(git log -1 --pretty=tformat:"%B") # followed by ${changeset}
- vcs_changeset_files=(git diff-tree --no-commit-id --name-only -r) # followed by ${changeset}
- ;;
-
- "hg")
- echo "Using Mercurial version control system"
- vcs_status=(hg status)
- vcs_list_changesets=(hg log --no-merges -v -d "${year}-01-01 to ${year}-12-31" --template '{node}\n')
- vcs_changeset_message=(hg log -l1 --template '{desc}\n' --rev) # followed by ${changeset}
- vcs_changeset_files=(hg log -l1 -v --template '{files}\n' --rev) # followed by ${changeset}
- ;;
-
- *)
- echo "Usage: `basename "$0"` <git|hg> [year [company]]"
- exit 1
- ;;
-esac
-
 # Return true if it makes sense to edit this file
 saneFileToCheck()
 {
  if [ "$1" != "" -a -f $1 ] ; then
- isText=`file "$1" | egrep -i '(text|source)' | cat`
+ isText=`file "$1" | grep -i -E '(text|source)' | cat`
  hasCopyright=`grep 'Copyright' "$1" | cat`
  lastLineCount=`tail -1 "$1" | wc -l`
  if [ "${isText}" != "" \
@@ -131,9 +142,13 @@ updateFile() # file
  rm -f $1.OLD
  mv $1 $1.OLD
  cat $1.OLD | \
- sed -e "s@\(${copyright} [12][0-9][0-9][0-9],\) [12][0-9][0-9][0-9], ${company}@\1 ${year}, ${company}@" | \
- sed -e "s@\(${copyright} [12][0-9][0-9][0-9],\) ${company}@\1 ${year}, ${company}@" | \
- sed -e "s@${copyright} ${year}, ${year}, ${company}@${copyright} ${year}, ${company}@" \
+ sed -e "s@\(${copyright} \(${copyright_symbol} \)\{0,1\}[12][0-9][0-9][0-9],\) [12][0-9][0-9][0-9], ${company}@\1 ${year}, ${company}@" | \
+ sed -e "s@\(${copyright} \(${copyright_symbol} \)\{0,1\}[12][0-9][0-9][0-9],\) [12][0-9][0-9][0-9] ${company}@\1 ${year} ${company}@" | \
+ sed -e "s@\(${copyright} \(${copyright_symbol} \)\{0,1\}[12][0-9][0-9][0-9],\) ${company}@\1 ${year}, ${company}@" | \
+ sed -e "s@\(${copyright} \(${copyright_symbol} \)\{0,1\}[12][0-9][0-9][0-9],\) ${company}@\1, ${year}, ${company}@" | \
+ sed -e "s@\(${copyright} \(${copyright_symbol} \)\{0,1\}[12][0-9][0-9][0-9]\) ${company}@\1, ${year} ${company}@" | \
+ sed -e "s@${copyright} ${year}, ${year}, ${company}@${copyright} ${year}, ${company}@" | \
+ sed -e "s@${copyright} ${copyright_symbol} ${year}, ${year}, ${company}@${copyright} ${copyright_symbol} ${year}, ${company}@" \
  > $1
  if ! diff -b -w $1.OLD $1 > /dev/null ; then \
  changed="true"
@@ -205,19 +220,19 @@ if [ -s ${all_changesets} ] ; then
  "${vcs_changeset_message[@]}" "${changeset}" > ${desc}
  printf "%d: %s\n%s\n" ${index} "${changeset}" "`cat ${desc}|head -1`"
  if [ "${year}" = "2010" ] ; then
- if cat ${desc} | fgrep -i "Added tag" > /dev/null ; then
+ if cat ${desc} | grep -i -F "Added tag" > /dev/null ; then
  printf " EXCLUDED tag changeset.\n"
- elif cat ${desc} | fgrep -i rebrand > /dev/null ; then
+ elif cat ${desc} | grep -i -F rebrand > /dev/null ; then
  printf " EXCLUDED rebrand changeset.\n"
- elif cat ${desc} | fgrep -i copyright > /dev/null ; then
+ elif cat ${desc} | grep -i -F copyright > /dev/null ; then
  printf " EXCLUDED copyright changeset.\n"
  else
  updateChangesetFiles ${changeset}
  fi
  else
- if cat ${desc} | fgrep -i "Added tag" > /dev/null ; then
+ if cat ${desc} | grep -i -F "Added tag" > /dev/null ; then
  printf " EXCLUDED tag changeset.\n"
- elif cat ${desc} | fgrep -i "copyright year" > /dev/null ; then
+ elif cat ${desc} | grep -i -F "copyright year" > /dev/null ; then
  printf " EXCLUDED copyright year changeset.\n"
  else
  updateChangesetFiles ${changeset}