[packages/openjdk12] fix build on aarch64

atler atler at pld-linux.org
Fri Feb 11 00:56:33 CET 2022


commit ebf5b46e9211aa09ed1973ad2ccc9e555894f51e
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Feb 10 23:49:21 2022 +0100

    fix build on aarch64

 aarch64.patch  | 12 ++++++++++++
 openjdk12.spec |  2 ++
 2 files changed, 14 insertions(+)
---
diff --git a/openjdk12.spec b/openjdk12.spec
index 8e84a49..08779eb 100644
--- a/openjdk12.spec
+++ b/openjdk12.spec
@@ -35,6 +35,7 @@ Source10:	make-cacerts.sh
 Patch0:		no_optflags.patch
 Patch1:		make-4.3.patch
 Patch2:		x32.patch
+Patch3:		aarch64.patch
 URL:		http://openjdk.java.net/
 BuildRequires:	/usr/bin/jar
 BuildRequires:	alsa-lib-devel
@@ -350,6 +351,7 @@ Przykłady dla OpenJDK.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.
diff --git a/aarch64.patch b/aarch64.patch
new file mode 100644
index 0000000..a41d038
--- /dev/null
+++ b/aarch64.patch
@@ -0,0 +1,12 @@
+diff -r 6721e038257a -r 15cc1c8a6371 hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp
+--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp	Thu Dec 13 01:15:21 2018 +0000
++++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp	Tue Feb 04 04:42:57 2020 +0000
+@@ -38,8 +38,6 @@
+  protected:
+ 
+  protected:
+-  using MacroAssembler::call_VM_leaf_base;
+-
+   // Interpreter specific version of call_VM_base
+   using MacroAssembler::call_VM_leaf_base;
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openjdk12.git/commitdiff/ebf5b46e9211aa09ed1973ad2ccc9e555894f51e



More information about the pld-cvs-commit mailing list