Update JBR (jbr21.1163) to OpenJDK 21.0.10 #584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

sercher wants to merge 323 commits into JetBrains:jbr21.1163 from bell-sw:update_21.0.10_1163

+58,568 −29,509

The diff you're trying to view is too large. We only load the first 3000 changed files.

.github/workflows/build-cross-compile.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -60,33 +60,33 @@ jobs:
  
                gnu-arch: aarch64

                debian-arch: arm64

                debian-repository: https://httpredir.debian.org/debian/

                debian-version: bookworm

                debian-version: trixie

                tolerate-sysroot-errors: false

              - target-cpu: arm

                gnu-arch: arm

                debian-arch: armhf

                debian-repository: https://httpredir.debian.org/debian/

                debian-version: bookworm

                debian-version: trixie

                tolerate-sysroot-errors: false

                gnu-abi: eabihf

              - target-cpu: s390x

                gnu-arch: s390x

                debian-arch: s390x

                debian-repository: https://httpredir.debian.org/debian/

                debian-version: bookworm

                debian-version: trixie

                tolerate-sysroot-errors: false

              - target-cpu: ppc64le

                gnu-arch: powerpc64le

                debian-arch: ppc64el

                debian-repository: https://httpredir.debian.org/debian/

                debian-version: bookworm

                debian-version: trixie

                tolerate-sysroot-errors: false

              - target-cpu: riscv64

                gnu-arch: riscv64

                debian-arch: riscv64

                debian-repository: https://httpredir.debian.org/debian/

                debian-version: sid

                tolerate-sysroot-errors: true

                debian-version: trixie

                tolerate-sysroot-errors: false

        steps:

          - name: 'Checkout the JDK source'

.github/workflows/main.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -234,8 +234,8 @@ jobs:
  
        uses: ./.github/workflows/build-macos.yml

        with:

          platform: macos-x64

          runs-on: 'macos-13'

          xcode-toolset-version: '14.3.1'

          runs-on: 'macos-15-intel'

          xcode-toolset-version: '16.4'

          configure-arguments: ${{ github.event.inputs.configure-arguments }}

          make-arguments: ${{ github.event.inputs.make-arguments }}

        if: needs.prepare.outputs.macos-x64 == 'true'

    @@ -246,8 +246,8 @@ jobs:
  
        uses: ./.github/workflows/build-macos.yml

        with:

          platform: macos-aarch64

          runs-on: 'macos-14'

          xcode-toolset-version: '15.4'

          runs-on: 'macos-15'

          xcode-toolset-version: '16.4'

          configure-arguments: ${{ github.event.inputs.configure-arguments }}

          make-arguments: ${{ github.event.inputs.make-arguments }}

        if: needs.prepare.outputs.macos-aarch64 == 'true'

    @@ -308,17 +308,6 @@ jobs:
  
          bootjdk-platform: linux-x64

          runs-on: ubuntu-22.04

      test-macos-x64:

        name: macos-x64

        needs:

          - build-macos-x64

        uses: ./.github/workflows/test.yml

        with:

          platform: macos-x64

          bootjdk-platform: macos-x64

          runs-on: macos-13

          xcode-toolset-version: '14.3.1'

      test-macos-aarch64:

        name: macos-aarch64

        needs:

    @@ -327,8 +316,8 @@ jobs:
  
        with:

          platform: macos-aarch64

          bootjdk-platform: macos-aarch64

          runs-on: macos-14

          xcode-toolset-version: '15.4'

          runs-on: macos-15

          xcode-toolset-version: '16.4'

      test-windows-x64:

        name: windows-x64

.jcheck/conf

-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     [general]
     project=jdk-updates
     jbs=JDK
-    version=21.0.9
+    version=21.0.10
     [checks]
     error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists
@@ Expand Down @@

doc/building.html

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -476,7 +476,7 @@ <h3 id="linux">Linux</h3>
  
    <p>The basic tooling is provided as part of the core operating system,

    but you will most likely need to install developer packages.</p>

    <p>For apt-based distributions (Debian, Ubuntu, etc), try this:</p>

    <pre><code>sudo apt-get install build-essential</code></pre>

    <pre><code>sudo apt-get install build-essential autoconf</code></pre>

    <p>For rpm-based distributions (Fedora, Red Hat, etc), try this:</p>

    <pre><code>sudo yum groupinstall &quot;Development Tools&quot;</code></pre>

    <p>For Alpine Linux, aside from basic tooling, install the GNU versions

    @@ -539,7 +539,7 @@ <h2 id="native-compiler-toolchain-requirements">Native Compiler
  
    <tbody>

    <tr class="odd">

    <td>Linux</td>

    <td>gcc 11.2.0</td>

    <td>gcc 13.2.0</td>

    </tr>

    <tr class="even">

    <td>macOS</td>

    @@ -560,7 +560,7 @@ <h3 id="gcc">gcc</h3>
  
    generate a warning by <code>configure</code> and are unlikely to

    work.</p>

    <p>The JDK is currently known to be able to compile with at least

    version 11.2 of gcc.</p>

    version 13.2 of gcc.</p>

    <p>In general, any version between these two should be usable.</p>

    <h3 id="clang">clang</h3>

    <p>The minimum accepted version of clang is 3.5. Older versions will not

doc/building.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -289,7 +289,7 @@ will most likely need to install developer packages.
  
    For apt-based distributions (Debian, Ubuntu, etc), try this:

    ```

    sudo apt-get install build-essential

    sudo apt-get install build-essential autoconf

    ```

    For rpm-based distributions (Fedora, Red Hat, etc), try this:

    @@ -336,7 +336,7 @@ issues.
  
    | Operating system   | Toolchain version                          |

    | ------------------ | ------------------------------------------ |

    | Linux              | gcc 11.2.0                                 |

    | Linux              | gcc 13.2.0                                 |

    | macOS              | Apple Xcode 10.1 (using clang 10.0.0)      |

    | Windows            | Microsoft Visual Studio 2022 update 17.1.0 |

    @@ -350,7 +350,7 @@ features that it does support.
  
    The minimum accepted version of gcc is 5.0. Older versions will generate a warning

    by `configure` and are unlikely to work.

    The JDK is currently known to be able to compile with at least version 11.2 of

    The JDK is currently known to be able to compile with at least version 13.2 of

    gcc.

    In general, any version between these two should be usable.

make/RunTests.gmk

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1077,7 +1077,7 @@ UseSpecialTestHandler = \
  
    # Now process each test to run and setup a proper make rule

    $(foreach test, $(TESTS_TO_RUN), \

      $(eval TEST_ID := $(shell $(ECHO) $(strip $(test)) | \

          $(TR) -cs '[a-z][A-Z][0-9]\n' '[_*1000]')) \

          $(TR) -cs '[a-z][A-Z][0-9]\n' '_')) \

      $(eval ALL_TEST_IDS += $(TEST_ID)) \

      $(if $(call UseCustomTestHandler, $(test)), \

        $(eval $(call SetupRunCustomTest, $(TEST_ID), \

    @@ -1157,9 +1157,9 @@ run-test-report: post-run-test
  
    	    TEST TOTAL PASS FAIL ERROR " "

    	$(foreach test, $(TESTS_TO_RUN), \

    	  $(eval TEST_ID := $(shell $(ECHO) $(strip $(test)) | \

    	      $(TR) -cs '[a-z][A-Z][0-9]\n' '[_*1000]')) \

    	      $(TR) -cs '[a-z][A-Z][0-9]\n' '_')) \

    	    $(ECHO) >> $(TEST_LAST_IDS) $(TEST_ID) $(NEWLINE) \

    	  $(eval NAME_PATTERN := $(shell $(ECHO) $(test) | $(TR) -c '\n' '[_*1000]')) \

    	  $(eval NAME_PATTERN := $(shell $(ECHO) $(test) | $(TR) -c '\n' '_')) \

    	  $(if $(filter __________________________________________________%, $(NAME_PATTERN)), \

    	    $(eval TEST_NAME := ) \

    	    $(PRINTF) >> $(TEST_SUMMARY) "%2s %-49s\n" "  " "$(test)"  $(NEWLINE) \

make/autoconf/basic_tools.m4

-Original file line number
+Diff line change
@@ Expand Up / @@ -378,7 +378,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS], @@
       # Check if it's a GNU date compatible version
       AC_MSG_CHECKING([if date is a GNU compatible version])
-      check_date=`$DATE --version 2>&1 | $GREP "GNU\|BusyBox"`
+      check_date=`$DATE --version 2>&1 | $GREP "GNU\|BusyBox\|uutils"`
       if test "x$check_date" != x; then
         AC_MSG_RESULT([yes])
         IS_GNU_DATE=yes
@@ Expand Down @@

make/autoconf/boot-jdk.m4

-Original file line number
+Diff line change
@@ Expand Up / @@ -444,6 +444,9 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS], @@
       # Force en-US environment
       UTIL_ADD_JVM_ARG_IF_OK([-Duser.language=en -Duser.country=US],boot_jdk_jvmargs,[$JAVA])
+      UTIL_ADD_JVM_ARG_IF_OK([-Xlog:all=off:stdout],boot_jdk_jvmargs,[$JAVA])
+      UTIL_ADD_JVM_ARG_IF_OK([-Xlog:all=warning:stderr],boot_jdk_jvmargs,[$JAVA])
       if test "x$BOOTJDK_USE_LOCAL_CDS" = xtrue; then
         # Use our own CDS archive
         UTIL_ADD_JVM_ARG_IF_OK([$boot_jdk_cds_args -Xshare:auto],boot_jdk_jvmargs,[$JAVA])
@@ Expand Down @@

make/autoconf/configure.ac

-Original file line number
+Diff line change
@@ Expand Up / @@ -223,6 +223,9 @@ JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER @@
     # LeakSanitizer
     JDKOPT_SETUP_LEAK_SANITIZER
+    # Setup static analyzer
+    JDKOPT_SETUP_STATIC_ANALYZER
     # Fallback linker
     # This needs to go before 'LIB_DETERMINE_DEPENDENCIES'
     JDKOPT_SETUP_FALLBACK_LINKER
@@ Expand Down @@

make/autoconf/flags-cflags.m4

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -625,8 +625,8 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
  
        TOOLCHAIN_CFLAGS_JVM="-qtbtable=full -qtune=balanced -fno-exceptions \

            -qalias=noansi -qstrict -qtls=default -qnortti -qnoeh -qignerrno -qstackprotect"

      elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then

        TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:strictStrings -MP"

        TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:preprocessor -Zc:strictStrings -Zc:wchar_t-"

        TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:throwingNew -permissive- -MP"

        TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:preprocessor -Zc:throwingNew -permissive- -Zc:wchar_t-"

      fi

      # CFLAGS C language level for JDK sources (hotspot only uses C++)

make/autoconf/jdk-options.m4

-Original file line number
+Diff line change
@@ Expand Up / @@ -487,6 +487,31 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_ADDRESS_SANITIZER], @@
     ###############################################################################
     #
+    # Static analyzer
+    #
+    AC_DEFUN_ONCE([JDKOPT_SETUP_STATIC_ANALYZER],
+    [
+      UTIL_ARG_ENABLE(NAME: static-analyzer, DEFAULT: false, RESULT: STATIC_ANALYZER_ENABLED,
+          DESC: [enable the GCC static analyzer],
+          CHECK_AVAILABLE: [
+            AC_MSG_CHECKING([if static analyzer is available])
+            if test "x$TOOLCHAIN_TYPE" = "xgcc"; then
+              AC_MSG_RESULT([yes])
+            else
+              AC_MSG_RESULT([no])
+              AVAILABLE=false
+            fi
+          ],
+          IF_ENABLED: [
+            STATIC_ANALYZER_CFLAGS="-fanalyzer -Wno-analyzer-fd-leak"
+            CFLAGS_JDKLIB="$CFLAGS_JDKLIB $STATIC_ANALYZER_CFLAGS"
+            CFLAGS_JDKEXE="$CFLAGS_JDKEXE $STATIC_ANALYZER_CFLAGS"
+          ])
+      AC_SUBST(STATIC_ANALYZER_ENABLED)
+    ])
+    ################################################################################
+    #
     # LeakSanitizer
     #
     AC_DEFUN_ONCE([JDKOPT_SETUP_LEAK_SANITIZER],
@@ Expand Down @@

make/conf/jib-profiles.js

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1080,10 +1080,10 @@ var getJibProfilesProfiles = function (input, common, data) {
  
    var getJibProfilesDependencies = function (input, common) {

        var devkit_platform_revisions = {

            linux_x64: "gcc11.2.0-OL6.4+1.0",

            linux_x64: "gcc13.2.0-OL6.4+1.0",

            macosx: "Xcode12.4+1.1",

            windows_x64: "VS2022-17.1.0+1.1",

            linux_aarch64: input.build_cpu == "x64" ? "gcc11.2.0-OL7.6+1.1" : "gcc11.2.0-OL7.6+1.0",

            linux_aarch64: "gcc13.2.0-OL7.6+1.0",

            linux_arm: "gcc8.2.0-Fedora27+1.0",

            linux_ppc64le: "gcc8.2.0-Fedora27+1.0",

            linux_s390x: "gcc8.2.0-Fedora27+1.0",

make/conf/version-numbers.conf

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -28,12 +28,12 @@
  
    DEFAULT_VERSION_FEATURE=21

    DEFAULT_VERSION_INTERIM=0

    DEFAULT_VERSION_UPDATE=9

    DEFAULT_VERSION_UPDATE=10

    DEFAULT_VERSION_PATCH=0

    DEFAULT_VERSION_EXTRA1=0

    DEFAULT_VERSION_EXTRA2=0

    DEFAULT_VERSION_EXTRA3=0

    DEFAULT_VERSION_DATE=2025-10-21

    DEFAULT_VERSION_DATE=2026-01-20

    DEFAULT_VERSION_CLASSFILE_MAJOR=65  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"

    DEFAULT_VERSION_CLASSFILE_MINOR=0

    DEFAULT_VERSION_DOCS_API_SINCE=11

make/data/asan/asan_default_options.c

-Original file line number
+Diff line change
@@ Expand Up @@
     #endif
         "print_suppressions=0,"
         "handle_segv=0,"
+        // A lot of libjsig related tests fail because of the link order check; so better avoid it
+        "verify_asan_link_order=0,"
         // See https://github.com/google/sanitizers/issues/1322. Hopefully this is resolved
         // at some point and we can remove this option.
         "intercept_tls_get_addr=0";
@@ Expand Down @@

make/devkit/Tools.gmk

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -55,11 +55,11 @@ KERNEL_HEADERS_RPM := kernel-headers
  
    ifeq ($(BASE_OS), OL)

      ifeq ($(ARCH), aarch64)

        BASE_URL := http://yum.oracle.com/repo/OracleLinux/OL7/6/base/$(ARCH)/

        BASE_URL := https://yum.oracle.com/repo/OracleLinux/OL7/6/base/$(ARCH)/

        LINUX_VERSION := OL7.6

        KERNEL_HEADERS_RPM := kernel-uek-headers

      else

        BASE_URL := http://yum.oracle.com/repo/OracleLinux/OL6/4/base/$(ARCH)/

        BASE_URL := https://yum.oracle.com/repo/OracleLinux/OL6/4/base/$(ARCH)/

        LINUX_VERSION := OL6.4

      endif

    else ifeq ($(BASE_OS), Fedora)

    @@ -96,8 +96,17 @@ endif
  
    # Define external dependencies

    # Latest that could be made to work.

    GCC_VER := 11.3.0

    ifeq ($(GCC_VER), 11.3.0)

    GCC_VER := 13.2.0

    ifeq ($(GCC_VER), 13.2.0)

      gcc_ver := gcc-13.2.0

      binutils_ver := binutils-2.41

      ccache_ver := ccache-3.7.12

      mpfr_ver := mpfr-4.2.0

      gmp_ver := gmp-6.3.0

      mpc_ver := mpc-1.3.1

      gdb_ver := gdb-13.2

      REQUIRED_MIN_MAKE_MAJOR_VERSION := 4

    else ifeq ($(GCC_VER), 11.3.0)

      gcc_ver := gcc-11.3.0

      binutils_ver := binutils-2.39

      ccache_ver := ccache-3.7.12

    @@ -671,7 +680,11 @@ $(PREFIX)/Tools.gmk: ./Tools.gmk
  
    	rm -rf $@

    	cp $< $@

    THESE_MAKEFILES := $(PREFIX)/Makefile $(PREFIX)/Tools.gmk

    $(PREFIX)/Tars.gmk: ./Tars.gmk

    	rm -rf $@

    	cp $< $@

    THESE_MAKEFILES := $(PREFIX)/Makefile $(PREFIX)/Tools.gmk $(PREFIX)/Tars.gmk

    ##########################################################################################

make/ide/netbeans/langtools/build.xml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,6 +1,6 @@
  
    <?xml version="1.0" encoding="UTF-8"?>

    <!--

     Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.

     Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.

     Redistribution and use in source and binary forms, with or without

     modification, are permitted provided that the following conditions

    @@ -242,7 +242,7 @@
  
                    </nbjpdastart>

                    <property

                        name="@{jpda.jvmargs.property}"

                        value="-Xdebug -Xnoagent -Djava.compiler=none -Xrunjdwp:transport=dt_socket,address=${jpda.address}"

                        value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"

                    />

                </sequential>

            </macrodef>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update JBR (jbr21.1163) to OpenJDK 21.0.10 #584

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Update JBR (jbr21.1163) to OpenJDK 21.0.10 #584

Are you sure you want to change the base?

Update JBR (jbr21.1163) to OpenJDK 21.0.10 #584

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!