From c3866dcdd49358ee3bc30422a4a7e0f44f64d597 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 16 Oct 2022 21:54:47 -0700 Subject: [PATCH] openjdk10-bootstrap: fix build with gcc 12 and glibc 2.36 --- .../patches/fix-path-exception-glibc.patch | 31 +++++++++++++++++++ .../fix-pointer-comparison-gcc12.patch | 11 +++++++ srcpkgs/openjdk10-bootstrap/template | 2 +- 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/openjdk10-bootstrap/patches/fix-path-exception-glibc.patch create mode 100644 srcpkgs/openjdk10-bootstrap/patches/fix-pointer-comparison-gcc12.patch diff --git a/srcpkgs/openjdk10-bootstrap/patches/fix-path-exception-glibc.patch b/srcpkgs/openjdk10-bootstrap/patches/fix-path-exception-glibc.patch new file mode 100644 index 000000000000..292f527318a1 --- /dev/null +++ b/srcpkgs/openjdk10-bootstrap/patches/fix-path-exception-glibc.patch @@ -0,0 +1,31 @@ +Fixes the following issue with glibc 2.36: + +Error occurred during initialization of boot layer +java.lang.AssertionError: java.net.URISyntaxException: Illdk-k.internal.jvmstat/ +Caused by: java.net.URISyntaxException: Illegal character in path at index 32: file:///builddir/jdk11u-jdk-11-2er-release/jdk/modules/jdk.internal.jvmstat/ +make[3]: *** [ExplodedImageOptimize.gmk:41: /builddir/jdk11u-jdk-11-27/build/linux-x86_64-normal-server-release/jdk/_packages_attribute.done] Error 1 +make[2]: *** [make/Main.gmk:347: exploded-image-optimize] Error 2 + +From 789b6089954d04a0222434916c93b1ed33c629c8 Mon Sep 17 00:00:00 2001 +From: Vladimir Kozlov +Date: Mon, 20 Aug 2018 15:10:20 -0700 +Subject: [PATCH] 8209735: Disable avx512 by default + +Reviewed-by: iveresov, ecaspole +--- + src/hotspot/cpu/x86/globals_x86.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/hotspot/cpu/x86/globals_x86.hpp b/src/hotspot/cpu/x86/globals_x86.hpp +index 423e1b1e478..49073f1834a 100644 +--- a/src/hotspot/cpu/x86/globals_x86.hpp ++++ b/src/hotspot/cpu/x86/globals_x86.hpp +@@ -119,7 +119,7 @@ define_pd_global(bool, ThreadLocalHandshakes, false); + product(bool, UseStoreImmI16, true, \ + "Use store immediate 16-bits value instruction on x86") \ + \ +- product(intx, UseAVX, 3, \ ++ product(intx, UseAVX, 2, \ + "Highest supported AVX instructions set on x86/x64") \ + range(0, 99) \ + \ diff --git a/srcpkgs/openjdk10-bootstrap/patches/fix-pointer-comparison-gcc12.patch b/srcpkgs/openjdk10-bootstrap/patches/fix-pointer-comparison-gcc12.patch new file mode 100644 index 000000000000..fd9ca2e8c3d9 --- /dev/null +++ b/srcpkgs/openjdk10-bootstrap/patches/fix-pointer-comparison-gcc12.patch @@ -0,0 +1,11 @@ +--- a/src/hotspot/os/linux/os_linux.cpp ++++ b/src/hotspot/os/linux/os_linux.cpp +@@ -2155,7 +2155,7 @@ void os::Linux::print_container_info(out + } + + p = OSContainer::cpu_cpuset_memory_nodes(); +- if (p < 0) ++ if (p != NULL) + st->print("cpu_memory_nodes() failed\n"); + else { + st->print("cpu_memory_nodes: %s\n", p); diff --git a/srcpkgs/openjdk10-bootstrap/template b/srcpkgs/openjdk10-bootstrap/template index c61d33c697e8..f9cac7e371d7 100644 --- a/srcpkgs/openjdk10-bootstrap/template +++ b/srcpkgs/openjdk10-bootstrap/template @@ -2,7 +2,7 @@ _final_jdk_home="usr/lib/jvm/java-10-openjdk" pkgname=openjdk10-bootstrap version=10.0.2p13 -revision=2 +revision=3 _repo_ver=${version/p/+} archs="x86_64* i686* aarch64* arm* ppc64*" wrksrc="jdk10u-jdk-${_repo_ver}"