Skip to content

Commit 42cccb1

Browse files
committed
8319570: Change to GCC 13.2.0 for building on Linux at Oracle
Reviewed-by: mdoerr, phh Backport-of: 1802cb566e956febebc181da26a666bea4942e87
1 parent a908bb4 commit 42cccb1

File tree

4 files changed

+24
-11
lines changed

4 files changed

+24
-11
lines changed

doc/building.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ <h2 id="native-compiler-toolchain-requirements">Native Compiler
539539
<tbody>
540540
<tr class="odd">
541541
<td>Linux</td>
542-
<td>gcc 11.2.0</td>
542+
<td>gcc 13.2.0</td>
543543
</tr>
544544
<tr class="even">
545545
<td>macOS</td>
@@ -560,7 +560,7 @@ <h3 id="gcc">gcc</h3>
560560
generate a warning by <code>configure</code> and are unlikely to
561561
work.</p>
562562
<p>The JDK is currently known to be able to compile with at least
563-
version 11.2 of gcc.</p>
563+
version 13.2 of gcc.</p>
564564
<p>In general, any version between these two should be usable.</p>
565565
<h3 id="clang">clang</h3>
566566
<p>The minimum accepted version of clang is 3.5. Older versions will not

doc/building.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ issues.
336336

337337
| Operating system | Toolchain version |
338338
| ------------------ | ------------------------------------------ |
339-
| Linux | gcc 11.2.0 |
339+
| Linux | gcc 13.2.0 |
340340
| macOS | Apple Xcode 10.1 (using clang 10.0.0) |
341341
| Windows | Microsoft Visual Studio 2022 update 17.1.0 |
342342

@@ -350,7 +350,7 @@ features that it does support.
350350
The minimum accepted version of gcc is 5.0. Older versions will generate a warning
351351
by `configure` and are unlikely to work.
352352

353-
The JDK is currently known to be able to compile with at least version 11.2 of
353+
The JDK is currently known to be able to compile with at least version 13.2 of
354354
gcc.
355355

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

make/conf/jib-profiles.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,10 +1080,10 @@ var getJibProfilesProfiles = function (input, common, data) {
10801080
var getJibProfilesDependencies = function (input, common) {
10811081

10821082
var devkit_platform_revisions = {
1083-
linux_x64: "gcc11.2.0-OL6.4+1.0",
1083+
linux_x64: "gcc13.2.0-OL6.4+1.0",
10841084
macosx: "Xcode12.4+1.1",
10851085
windows_x64: "VS2022-17.1.0+1.1",
1086-
linux_aarch64: input.build_cpu == "x64" ? "gcc11.2.0-OL7.6+1.1" : "gcc11.2.0-OL7.6+1.0",
1086+
linux_aarch64: "gcc13.2.0-OL7.6+1.0",
10871087
linux_arm: "gcc8.2.0-Fedora27+1.0",
10881088
linux_ppc64le: "gcc8.2.0-Fedora27+1.0",
10891089
linux_s390x: "gcc8.2.0-Fedora27+1.0",

make/devkit/Tools.gmk

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ KERNEL_HEADERS_RPM := kernel-headers
5555

5656
ifeq ($(BASE_OS), OL)
5757
ifeq ($(ARCH), aarch64)
58-
BASE_URL := http://yum.oracle.com/repo/OracleLinux/OL7/6/base/$(ARCH)/
58+
BASE_URL := https://yum.oracle.com/repo/OracleLinux/OL7/6/base/$(ARCH)/
5959
LINUX_VERSION := OL7.6
6060
KERNEL_HEADERS_RPM := kernel-uek-headers
6161
else
62-
BASE_URL := http://yum.oracle.com/repo/OracleLinux/OL6/4/base/$(ARCH)/
62+
BASE_URL := https://yum.oracle.com/repo/OracleLinux/OL6/4/base/$(ARCH)/
6363
LINUX_VERSION := OL6.4
6464
endif
6565
else ifeq ($(BASE_OS), Fedora)
@@ -96,8 +96,17 @@ endif
9696
# Define external dependencies
9797

9898
# Latest that could be made to work.
99-
GCC_VER := 11.3.0
100-
ifeq ($(GCC_VER), 11.3.0)
99+
GCC_VER := 13.2.0
100+
ifeq ($(GCC_VER), 13.2.0)
101+
gcc_ver := gcc-13.2.0
102+
binutils_ver := binutils-2.41
103+
ccache_ver := ccache-3.7.12
104+
mpfr_ver := mpfr-4.2.0
105+
gmp_ver := gmp-6.3.0
106+
mpc_ver := mpc-1.3.1
107+
gdb_ver := gdb-13.2
108+
REQUIRED_MIN_MAKE_MAJOR_VERSION := 4
109+
else ifeq ($(GCC_VER), 11.3.0)
101110
gcc_ver := gcc-11.3.0
102111
binutils_ver := binutils-2.39
103112
ccache_ver := ccache-3.7.12
@@ -671,7 +680,11 @@ $(PREFIX)/Tools.gmk: ./Tools.gmk
671680
rm -rf $@
672681
cp $< $@
673682

674-
THESE_MAKEFILES := $(PREFIX)/Makefile $(PREFIX)/Tools.gmk
683+
$(PREFIX)/Tars.gmk: ./Tars.gmk
684+
rm -rf $@
685+
cp $< $@
686+
687+
THESE_MAKEFILES := $(PREFIX)/Makefile $(PREFIX)/Tools.gmk $(PREFIX)/Tars.gmk
675688

676689
##########################################################################################
677690

0 commit comments

Comments
 (0)