Merge jdk

Merge jdk-24+23
openjdk · Dec 19, 2024 · 403393f · 403393f
2 parents 5681091 + c0e6c3b
commit 403393f
Show file tree

Hide file tree

Showing 784 changed files with 125,116 additions and 29,581 deletions.
diff --git a/.github/actions/build-jtreg/action.yml b/.github/actions/build-jtreg/action.yml
@@ -52,24 +52,8 @@ runs:
 
     - name: 'Build JTReg'
       run: |
-        # Try building JTReg several times, backing off exponentially on failure.
-        # ~500 seconds in total should be enough to capture most of the transient
-        # failures.
-        for I in `seq 0 8`; do
-          rm -rf build/images/jtreg
-          bash make/build.sh --jdk "$JAVA_HOME_17_X64" && break
-          S=$(( 2 ** $I ))
-          echo "Failure. Waiting $S seconds before retrying"
-          sleep $S
-        done
-
-        # Check if build was successful
-        if [ ! -d build/images/jtreg ]; then
-          echo "Build failed"
-          exit 1;
-        fi
-
-        # Move files to the proper locations
+        # Build JTReg and move files to the proper locations
+        bash make/build.sh --jdk "$JAVA_HOME_17_X64"
         mkdir ../installed
         mv build/images/jtreg/* ../installed
       working-directory: jtreg/src

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -374,48 +374,3 @@ jobs:
       platform: windows-x64
       bootjdk-platform: windows-x64
       runs-on: windows-2019
-
-  # Remove bundles so they are not misconstrued as binary distributions from the JDK project
-  remove-bundles:
-    name: 'Remove bundle artifacts'
-    runs-on: ubuntu-22.04
-    if: always()
-    needs:
-      - build-linux-x64
-      - build-linux-x86-hs
-      - build-linux-x64-hs-nopch
-      - build-linux-x64-hs-zero
-      - build-linux-x64-hs-minimal
-      - build-linux-x64-hs-optimized
-      - build-linux-cross-compile
-      - build-alpine-linux-x64
-      - build-macos-x64
-      - build-macos-aarch64
-      - build-windows-x64
-      - build-windows-aarch64
-      - test-linux-x64
-      - test-macos-x64
-      - test-macos-aarch64
-      - test-windows-x64
-
-    steps:
-      - name: 'Remove bundle artifacts'
-        run: |
-          # Find and remove all bundle artifacts
-          # See: https://docs.github.com/en/rest/actions/artifacts?apiVersion=2022-11-28
-          ALL_ARTIFACT_IDS="$(curl -sL \
-              -H 'Accept: application/vnd.github+json' \
-              -H 'Authorization: Bearer ${{ github.token }}' \
-              -H 'X-GitHub-Api-Version: 2022-11-28' \
-              '${{ github.api_url }}/repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/artifacts?per_page=100')"
-          BUNDLE_ARTIFACT_IDS="$(echo "$ALL_ARTIFACT_IDS" | jq -r -c '.artifacts | map(select(.name|startswith("bundles-"))) | .[].id')"
-          for id in $BUNDLE_ARTIFACT_IDS; do
-            echo "Removing $id"
-            curl -sL \
-                -X DELETE \
-                -H 'Accept: application/vnd.github+json' \
-                -H 'Authorization: Bearer ${{ github.token }}' \
-                -H 'X-GitHub-Api-Version: 2022-11-28' \
-                "${{ github.api_url }}/repos/${{ github.repository }}/actions/artifacts/$id" \
-            || echo "Failed to remove bundle"
-          done
diff --git a/make/RunTests.gmk b/make/RunTests.gmk
@@ -604,7 +604,7 @@ define SetupRunMicroTestBody
     $1_JMH_JVM_ARGS += $$(MICRO_VM_OPTIONS) $$(MICRO_JAVA_OPTIONS)
   endif
 
-  $1_MICRO_VM_OPTIONS := -jvmArgs $(call ShellQuote,$$($1_JMH_JVM_ARGS))
+  $1_MICRO_VM_OPTIONS := -jvmArgsPrepend $(call ShellQuote,$$($1_JMH_JVM_ARGS))
 
   ifneq ($$(MICRO_ITER), )
     $1_MICRO_ITER := -i $$(MICRO_ITER)
@@ -856,6 +856,10 @@ define SetupRunJtregTestBody
     JTREG_AUTO_PROBLEM_LISTS += ProblemList-zgc.txt
   endif
 
+  ifneq ($$(findstring -XX:+UseShenandoahGC, $$(JTREG_ALL_OPTIONS)), )
+    JTREG_AUTO_PROBLEM_LISTS += ProblemList-shenandoah.txt
+  endif
+
   ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), )
     # Accept both absolute paths as well as relative to the current test root.
     $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \

diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
@@ -912,6 +912,36 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
         IF_FALSE: [$2FDLIBM_CFLAGS=""])
   fi
   AC_SUBST($2FDLIBM_CFLAGS)
+
+  # Check whether the compiler supports the Arm C Language Extensions (ACLE)
+  # for SVE. Set SVE_CFLAGS to -march=armv8-a+sve if it does.
+  # ACLE and this flag are required to build the aarch64 SVE related functions in
+  # libvectormath.
+  if test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
+    if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+      AC_LANG_PUSH(C)
+      OLD_CFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS -march=armv8-a+sve"
+      AC_MSG_CHECKING([if Arm SVE ACLE is supported])
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <arm_sve.h>],
+          [
+            svint32_t r = svdup_n_s32(1);
+            return 0;
+          ])],
+          [
+            AC_MSG_RESULT([yes])
+            $2SVE_CFLAGS="-march=armv8-a+sve"
+          ],
+          [
+            AC_MSG_RESULT([no])
+            $2SVE_CFLAGS=""
+          ]
+      )
+      CFLAGS="$OLD_CFLAGS"
+      AC_LANG_POP(C)
+    fi
+  fi
+  AC_SUBST($2SVE_CFLAGS)
 ])
 
 # FLAGS_SETUP_GCC6_COMPILER_FLAGS([PREFIX])

diff --git a/make/autoconf/flags-ldflags.m4 b/make/autoconf/flags-ldflags.m4
@@ -73,7 +73,9 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     if test "x$OPENJDK_TARGET_OS" = xlinux; then
       # Clang needs the lld linker to work correctly
       BASIC_LDFLAGS="-fuse-ld=lld -Wl,--exclude-libs,ALL"
-      UTIL_REQUIRE_PROGS(LLD, lld)
+      if test "x$CXX_IS_USER_SUPPLIED" = xfalse && test "x$CC_IS_USER_SUPPLIED" = xfalse; then
+        UTIL_REQUIRE_PROGS(LLD, lld)
+      fi
     fi
     if test "x$OPENJDK_TARGET_OS" = xaix; then
       BASIC_LDFLAGS="-Wl,-b64 -Wl,-brtl -Wl,-bnorwexec -Wl,-bnolibpath -Wl,-bnoexpall \

diff --git a/make/autoconf/spec.gmk.template b/make/autoconf/spec.gmk.template
@@ -827,6 +827,9 @@ OS_VERSION_MAJOR := @OS_VERSION_MAJOR@
 OS_VERSION_MINOR := @OS_VERSION_MINOR@
 OS_VERSION_MICRO := @OS_VERSION_MICRO@
 
+# Arm SVE
+SVE_CFLAGS := @SVE_CFLAGS@
+
 # Images directory definitions
 JDK_IMAGE_SUBDIR := jdk
 JRE_IMAGE_SUBDIR := jre

diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4
@@ -445,6 +445,7 @@ AC_DEFUN([TOOLCHAIN_FIND_COMPILER],
         AC_MSG_ERROR([User supplied compiler $1=[$]$1 does not exist])
       fi
     fi
+    $1_IS_USER_SUPPLIED=true
   else
     # No user supplied value. Locate compiler ourselves.
 
@@ -462,6 +463,7 @@ AC_DEFUN([TOOLCHAIN_FIND_COMPILER],
       HELP_MSG_MISSING_DEPENDENCY([devkit])
       AC_MSG_ERROR([Could not find a $COMPILER_NAME compiler. $HELP_MSG])
     fi
+    $1_IS_USER_SUPPLIED=false
   fi
 
   # Now we have a compiler binary in $1. Make sure it's okay.

diff --git a/make/data/cldr/common/bcp47/currency.xml b/make/data/cldr/common/bcp47/currency.xml
@@ -318,8 +318,9 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="zrn" description="Zairean New Zaire (1993-1998)"/>
             <type name="zrz" description="Zairean Zaire (1971-1993)"/>
             <type name="zwd" description="Zimbabwean Dollar (1980-2008)"/>
-            <type name="zwl" description="Zimbabwean Dollar (2009)" since="1.9"/>
+            <type name="zwl" description="Zimbabwean Dollar (2009-2024)" since="1.9"/>
             <type name="zwr" description="Zimbabwean Dollar (2008)" since="1.9"/>
+            <type name="zwg" description="Zimbabwean Gold" since="46"/>
         </key>
     </keyword>
 </ldmlBCP47>
diff --git a/make/data/cldr/common/bcp47/number.xml b/make/data/cldr/common/bcp47/number.xml
@@ -28,12 +28,14 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="ethi" description="Ethiopic numerals — algorithmic"/>
             <type name="finance" description="Financial numerals — may be algorithmic" since="21"/>
             <type name="fullwide" description="Full width digits"/>
+            <type name="gara" description="Garay digits" since="46"/>
             <type name="geor" description="Georgian numerals — algorithmic"/>
             <type name="gong" description="Gunjala Gondi digits" since="33.1"/>
             <type name="gonm" description="Masaram Gondi digits" since="32"/>
             <type name="grek" description="Greek upper case numerals — algorithmic"/>
             <type name="greklow" description="Greek lower case numerals — algorithmic"/>
             <type name="gujr" description="Gujarati digits"/>
+            <type name="gukh" description="Gurung Khema digits" since="46"/>
             <type name="guru" description="Gurmukhi digits"/>
             <type name="hanidays" description="Han-character day-of-month numbering for lunar/other traditional calendars" since="25"/>
             <type name="hanidec" description="Positional decimal system using Chinese number ideographs as digits" since="1.9"/>
@@ -52,6 +54,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="kawi" description="Kawi digits" since="42"/>
             <type name="khmr" description="Khmer digits"/>
             <type name="knda" description="Kannada digits"/>
+            <type name="krai" description="Kirat Rai digits" since="46"/>
             <type name="lana" description="Tai Tham Hora (secular) digits" since="21"/>
             <type name="lanatham" description="Tai Tham Tham (ecclesiastical) digits" since="21"/>
             <type name="laoo" description="Lao digits"/>
@@ -69,15 +72,19 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="mroo" description="Mro digits" since="28"/>
             <type name="mtei" description="Meetei Mayek digits" since="21"/>
             <type name="mymr" description="Myanmar digits"/>
+            <type name="mymrepka" description="Myanmar Eastern Pwo Karen digits" since="46"/>
+            <type name="mymrpao" description="Myanmar Pao digits" since="46"/>
             <type name="mymrshan" description="Myanmar Shan digits" since="21"/>
             <type name="mymrtlng" description="Myanmar Tai Laing digits" since="28"/>
             <type name="nagm" description="Nag Mundari digits" since="42"/>
             <type name="native" description="Native digits" since="21"/>
             <type name="newa" description="Newa digits" since="30"/>
             <type name="nkoo" description="N'Ko digits" since="21"/>
             <type name="olck" description="Ol Chiki digits" since="21"/>
+            <type name="onao" description="Ol Onal digits" since="46"/>
             <type name="orya" description="Oriya digits"/>
             <type name="osma" description="Osmanya digits" since="21"/>
+            <type name="outlined" description="Legacy computing outlined digits" since="46"/>
             <type name="rohg" description="Hanifi Rohingya digits" since="33.1"/>
             <type name="roman" description="Roman upper case numerals — algorithmic"/>
             <type name="romanlow" description="Roman lowercase numerals — algorithmic"/>
@@ -88,6 +95,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="sinh" description="Sinhala Lith digits" since="28"/>
             <type name="sora" description="Sora_Sompeng digits" since="21"/>
             <type name="sund" description="Sundanese digits" since="21"/>
+            <type name="sunu" description="Sunuwar digits" since="46"/>
             <type name="takr" description="Takri digits" since="21"/>
             <type name="talu" description="New Tai Lue digits" since="21"/>
             <type name="taml" description="Tamil numerals — algorithmic"/>