Skip to content

Commit 5b4f248

Browse files
OracleLabsAutomationOracleLabsAutomation
committed
Merge tag 'jdk-23+9' into labsjdk/automation-2-8-2024-8754
Added tag jdk-23+9 for changeset 1fb9e3d
2 parents 53a72c2 + 1fb9e3d commit 5b4f248

File tree

461 files changed

+6985
-3412
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

461 files changed

+6985
-3412
lines changed

‎.github/actions/get-jtreg/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -57,7 +57,7 @@ runs:
5757
- name: 'Build JTReg'
5858
run: |
5959
# Build JTReg and move files to the proper locations
60-
bash make/build.sh --jdk "$JAVA_HOME_17_X64"
60+
bash make/build.sh --jdk "$(realpath bootjdk/jdk)"
6161
mkdir ../installed
6262
mv build/images/jtreg/* ../installed
6363
working-directory: jtreg/src

‎.github/workflows/build-macos.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,9 @@ on:
3131
platform:
3232
required: true
3333
type: string
34+
runs-on:
35+
required: true
36+
type: string
3437
extra-conf-options:
3538
required: false
3639
type: string
@@ -55,7 +58,7 @@ on:
5558
jobs:
5659
build-macos:
5760
name: build
58-
runs-on: macos-13
61+
runs-on: ${{ inputs.runs-on }}
5962

6063
strategy:
6164
fail-fast: false
@@ -74,7 +77,7 @@ jobs:
7477
id: bootjdk
7578
uses: ./.github/actions/get-bootjdk
7679
with:
77-
platform: macos-x64
80+
platform: ${{ inputs.platform }}
7881

7982
- name: 'Get JTReg'
8083
id: jtreg
@@ -87,7 +90,7 @@ jobs:
8790
- name: 'Install toolchain and dependencies'
8891
run: |
8992
# Run Homebrew installation and xcode-select
90-
brew install make
93+
brew install autoconf make
9194
sudo xcode-select --switch /Applications/Xcode_${{ inputs.xcode-toolset-version }}.app/Contents/Developer
9295
# This will make GNU make available as 'make' and not only as 'gmake'
9396
echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH

‎.github/workflows/main.yml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -228,6 +228,7 @@ jobs:
228228
uses: ./.github/workflows/build-macos.yml
229229
with:
230230
platform: macos-x64
231+
runs-on: 'macos-13'
231232
xcode-toolset-version: '14.3.1'
232233
configure-arguments: ${{ github.event.inputs.configure-arguments }}
233234
make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -239,8 +240,8 @@ jobs:
239240
uses: ./.github/workflows/build-macos.yml
240241
with:
241242
platform: macos-aarch64
243+
runs-on: 'macos-14'
242244
xcode-toolset-version: '14.3.1'
243-
extra-conf-options: '--openjdk-target=aarch64-apple-darwin'
244245
configure-arguments: ${{ github.event.inputs.configure-arguments }}
245246
make-arguments: ${{ github.event.inputs.make-arguments }}
246247
if: needs.select.outputs.macos-aarch64 == 'true'
@@ -321,6 +322,16 @@ jobs:
321322
bootjdk-platform: macos-x64
322323
runs-on: macos-13
323324

325+
test-macos-aarch64:
326+
name: macos-aarch64
327+
needs:
328+
- build-macos-aarch64
329+
uses: ./.github/workflows/test.yml
330+
with:
331+
platform: macos-aarch64
332+
bootjdk-platform: macos-aarch64
333+
runs-on: macos-14
334+
324335
test-windows-x64:
325336
name: windows-x64
326337
needs:

‎.github/workflows/test.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ jobs:
6363
- 'hs/tier1 compiler part 1'
6464
- 'hs/tier1 compiler part 2'
6565
- 'hs/tier1 compiler part 3'
66+
- 'hs/tier1 compiler not-xcomp'
6667
- 'hs/tier1 gc'
6768
- 'hs/tier1 runtime'
6869
- 'hs/tier1 serviceability'
@@ -90,13 +91,17 @@ jobs:
9091
debug-suffix: -debug
9192

9293
- test-name: 'hs/tier1 compiler part 2'
93-
test-suite: 'test/hotspot/jtreg/:tier1_compiler_2 test/hotspot/jtreg/:tier1_compiler_not_xcomp'
94+
test-suite: 'test/hotspot/jtreg/:tier1_compiler_2'
9495
debug-suffix: -debug
9596

9697
- test-name: 'hs/tier1 compiler part 3'
9798
test-suite: 'test/hotspot/jtreg/:tier1_compiler_3'
9899
debug-suffix: -debug
99100

101+
- test-name: 'hs/tier1 compiler not-xcomp'
102+
test-suite: 'test/hotspot/jtreg/:tier1_compiler_not_xcomp'
103+
debug-suffix: -debug
104+
100105
- test-name: 'hs/tier1 gc'
101106
test-suite: 'test/hotspot/jtreg/:tier1_gc'
102107
debug-suffix: -debug

‎make/autoconf/basic.m4‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -123,6 +123,22 @@ AC_DEFUN_ONCE([BASIC_SETUP_BUILD_ENV],
123123
]
124124
)
125125
AC_SUBST(BUILD_ENV)
126+
127+
if test "x$LOCALE" != x; then
128+
# Check if we actually have C.UTF-8; if so, use it
129+
if $LOCALE -a | $GREP -q -E "^C\.(utf8|UTF-8)$"; then
130+
LOCALE_USED=C.UTF-8
131+
else
132+
AC_MSG_WARN([C.UTF-8 locale not found, using C locale])
133+
LOCALE_USED=C
134+
fi
135+
else
136+
AC_MSG_WARN([locale command not not found, using C locale])
137+
LOCALE_USED=C
138+
fi
139+
140+
export LC_ALL=$LOCALE_USED
141+
AC_SUBST(LOCALE_USED)
126142
])
127143

128144
###############################################################################

‎make/autoconf/basic_tools.m4‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -54,6 +54,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
5454
UTIL_REQUIRE_SPECIAL(SED, [AC_PROG_SED])
5555
5656
# Tools only needed on some platforms
57+
UTIL_LOOKUP_PROGS(LOCALE, locale)
5758
UTIL_LOOKUP_PROGS(PATHTOOL, cygpath wslpath)
5859
UTIL_LOOKUP_PROGS(CMD, cmd.exe, $PATH:/cygdrive/c/windows/system32:/mnt/c/windows/system32:/c/windows/system32)
5960
])

‎make/autoconf/flags-cflags.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
485485
CFLAGS_OS_DEF_JVM="-D_ALLBSD_SOURCE -D_DARWIN_C_SOURCE -D_XOPEN_SOURCE"
486486
CFLAGS_OS_DEF_JDK="-D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
487487
elif test "x$OPENJDK_TARGET_OS" = xaix; then
488-
CFLAGS_OS_DEF_JVM="-DAIX"
488+
CFLAGS_OS_DEF_JVM="-DAIX -D_LARGE_FILES"
489489
elif test "x$OPENJDK_TARGET_OS" = xbsd; then
490490
CFLAGS_OS_DEF_JDK="-D_ALLBSD_SOURCE"
491491
elif test "x$OPENJDK_TARGET_OS" = xwindows; then

‎make/autoconf/spec.gmk.template‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -56,8 +56,8 @@ COMMA := ,
5656
# What make to use for main processing, after bootstrapping top-level Makefile.
5757
MAKE := @MAKE@
5858

59-
# Make sure all shell commands are executed with the C locale
60-
export LC_ALL := C
59+
# Make sure all shell commands are executed with a proper locale
60+
export LC_ALL := @LOCALE_USED@
6161

6262
# Make sure we override any local CLASSPATH variable
6363
export CLASSPATH := @CLASSPATH@

‎make/conf/github-actions.conf‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,10 @@ MACOS_X64_BOOT_JDK_EXT=tar.gz
3636
MACOS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_macos-x64_bin.tar.gz
3737
MACOS_X64_BOOT_JDK_SHA256=af32e84c11009f72f783fdcdc9917efc277893988f097e198e2576875d1e88c1
3838

39+
MACOS_AARCH64_BOOT_JDK_EXT=tar.gz
40+
MACOS_AARCH64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_macos-aarch64_bin.tar.gz
41+
MACOS_AARCH64_BOOT_JDK_SHA256=f12e1e0a2dffc847951598f597c8ee60fb0913932f24b2b09c62cfd2f0f4dfb9
42+
3943
WINDOWS_X64_BOOT_JDK_EXT=zip
4044
WINDOWS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_windows-x64_bin.zip
4145
WINDOWS_X64_BOOT_JDK_SHA256=5434faaf029e66e7ce6e75770ca384de476750984a7d2881ef7686894c4b4944

‎make/hotspot/gensrc/GensrcAdlc.gmk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ ifeq ($(call check-jvm-feature, compiler2), true)
5151
endif
5252

5353
# Set the C++ standard
54-
ADLC_CFLAGS += $(ADLC_LANGSTD_CXXFLAG)
54+
ADLC_CFLAGS += $(ADLC_LANGSTD_CXXFLAGS)
5555

5656
# NOTE: The old build didn't set -DASSERT for windows but it doesn't seem to
5757
# hurt.

0 commit comments

Comments
 (0)