openjdk-12: fix aarch64 build.

This commit is contained in:
Andrius Štikonas 2021-12-18 17:08:35 +00:00
parent dc7d368291
commit 726cb036bd
3 changed files with 16 additions and 3 deletions

View File

@ -60,6 +60,7 @@ AUX openjdk-9.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea
AUX patches/10/aarch64_gcc_fix.patch 371 BLAKE2B 4662b97aba0022cfbf8f781425ffbf6ac68c444a468d4a8f2f70584f76c3d8ba04a65c600604e15ba2d0ace4a33b7c74ad2a060fcd6174d6212122a7b7eb2744 SHA512 f4f1bd49bb459caf62a5ef6bf96e0f7c69e8c40dec9a5413549d3b90dc29c8edf8d57e79d3810c5052253eea3d91131a94ea1ebade0f1e0b904724bae4dd5c3f
AUX patches/10/make-4.3.patch 741 BLAKE2B 6dab3601e6a6260f9813fab663211d8afe7fc08ff1af243bbd8ad90f8c58df5c713aec5cea7788eeabee9fce17e0aec5cf9b6f19becd5baf37a772773a445b36 SHA512 7d6ada121fbd7a4b29459b000fca225b3fb7d95d855459d43749d6ece60b8282418bd349cf235ccd41b86ac36b158e81f3184884883a551c240cb30dfe66fccd
AUX patches/10/pointer-comparison.patch 471 BLAKE2B 807c0970dc766d5fea54b8af1d2d0cdddfe75368bca32c6a8cb2c516db21c5e8056fce7715eb1b33ece68970ce6e0686bd061194ac2829432ad44da010767858 SHA512 48faf682eeb2d57873148d3fd948c66d20eebab360ce31352761ff5400bafbeca55a85dded04c38a0e4263d14521b4da41fd02b608b774e4d8e3784452c5c847
AUX patches/12/aarch64_gcc_fix.patch 371 BLAKE2B 1678b268d692fa7c187d822620e3d48475426090a5ecda6f89aa565260ace98a60f7215958b8ac18aff30dbfebb144469d9ac39021105ed9ccde62c695f4e946 SHA512 805b07b95066407a22bfb7d2b6650e7dfbe76b27f8b1f7172ed0955d75704e71150679303e8c0fe07407aaf771501e9adc91b7016fc46e2c0b39e72f21061b10
AUX patches/12/make-4.3.patch 740 BLAKE2B 973e21bfbfae8ead6184179f62594cfadecd14f9fa2fd0bce7c063899c4233bba2c36388284cc7adaaf2176391257543fe0df09560979f882d0c61916f12c9ed SHA512 ee8ba62ab5909648dccc1d5e1d12b4f35e813320a7919476bc1ff35bc2ef51030df3426616e0f636dd64a8b07021201f7bcb477253bb33a97cd0db8a6684137c
AUX patches/16/1001_ppc64le.patch 9158 BLAKE2B 6bf533c332ac2684216c394e13008bc8d806f2d938b94052cf7f8b267afe585b2bc607b3721c135c7516916595a5ab6ac84fcd96db5754c6cc05279c8c993698 SHA512 05845450afd2d8be9f9f3a69d24c92f2e18593beeb43d748efee53e92edaedacdde2bfcf46b07eb702e036fd3defe2e6418628c26d8e6114653aa521a5d309ce
AUX patches/17/1001_ppc64le.patch 9158 BLAKE2B 6bf533c332ac2684216c394e13008bc8d806f2d938b94052cf7f8b267afe585b2bc607b3721c135c7516916595a5ab6ac84fcd96db5754c6cc05279c8c993698 SHA512 05845450afd2d8be9f9f3a69d24c92f2e18593beeb43d748efee53e92edaedacdde2bfcf46b07eb702e036fd3defe2e6418628c26d8e6114653aa521a5d309ce
@ -101,7 +102,7 @@ DIST openjdk-nashorn-8.272_p10.tar.bz2 2850055 BLAKE2B 2348c0f45916101d9fcb4aaa2
DIST openjdk-nashorn-9.0.4_p12.tar.bz2 8961760 BLAKE2B 2ff03adf87a0e0561d52529cf95b8fb827e75773462be7ecddd60dc966e1a229b897eb65a0301a531dfcaff884122e612f1a24b5d5fbc8f0352a8d84218423d7 SHA512 848c6ece418e250561572ad704baeb565580098cfc5f849d4e1a3b41b916aae3487eb4d8d0b319f3a503d122ec064ed4de0678d06821c9a2bdb09c990e589c97
EBUILD openjdk-10.0.2_p13.ebuild 8436 BLAKE2B bd131f53e24af1017840de009275b8529e7f63fa564f58aa04824d8b8c56a92d2773db7fd941ed4048dd403ca2504d16f8e664a2cf0677e82471b4e6dc34a4f5 SHA512 8c066b1479e6e5a0428ae8ac6dae9fd7e133c05173b80e72031049dd83624401ca250d7a28e3212d123bb53f4ee2964794dabc71202a67d1110f1725971d128f
EBUILD openjdk-11.0.9_p11.ebuild 8408 BLAKE2B d191259f7cab2db1841825832104a3eaf1755bdf6f05d5325b13402771102b2dee85af652e290b91c050c1f7a0ecb43718b2d050eae08b68aa5319be7d7c0d40 SHA512 be78a0edc4eeacadde35ebdca9f1bd5f09af08d890cde1fa97df9587205bc84efd181b2980436dad0b2f6e378d398ce4a4d15f3c003900a6d40f0a7ba0fb2064
EBUILD openjdk-12.0.2_p01.ebuild 8439 BLAKE2B 071f12374676fc8956f6feb24f5f6ddc8b02fa2437475869f881952d45c436f4fcf5aaca19a7cae6564d49c0242c4267639a1304796b458ed17059204c7c817d SHA512 53de2d53ef40193c45c92eaaeef51ceb172eeadf87b9875781215e19f03378eb2fc3b9e0cec33fdda020c38b8cf3e64f68b7adca537cff211a3e53862186d64a
EBUILD openjdk-12.0.2_p01.ebuild 8499 BLAKE2B 68256c0c8973a223cc6e1b5679b3951477035167a6e7c0fcf5de18484c4bcff4c74c42b3cd7a784f3dba66935418937aeea4d13d97a7ca385412cf1e8499cfe7 SHA512 a0807e4ef5b65c950c9dddff0320cfb81748e8f04df969796e7500c13839b26f66cf70edec53a75c69fe67488d8e56f43c80362436fa506febf3ebfed82079d5
EBUILD openjdk-13.0.4_p01.ebuild 8417 BLAKE2B 521f065801713eec3290d6fca3ae224f8fae56c026dedcc9e609d9ad92bf2c21ba195d785b8936a1099bb69109fc744132e8876f8e15dcd85f8304cbf1771c4e SHA512 5c08b3a707929881bdac4b8759851f4f0b80482245890568149adadded1e597a8260e707264cf85ea082f610a1f290ca9a00961f78af38466e433f867bd8a8c9
EBUILD openjdk-14.0.2_p01.ebuild 8419 BLAKE2B cdf793ba4d051f57c89027fca2a42666227974d2d1dc9191d9ef21f18110fa302fa6dfbe0a1daf3a6609e1458319f2a6150c1c07180096f1ccd66206160e77fd SHA512 d18978808c7ee2c530eabe1d749681ad50314366590d7683b39854dee9b07f6a609b115ecfc58e021bda493c0eec8e17ff0178fe3b8261675feaf152b9c97f4a
EBUILD openjdk-15.0.0_p36.ebuild 8645 BLAKE2B 8a4516e98f32bb038b6a5b0123bba4615842c6d19ed1fc1416c71f789d5ca6e366d8a71501d650c3a77304d80f3140a1e437b98b3045186ee538a81307d5f457 SHA512 7e637fae9f756c290479602175f8c9ca5d31a5d75fe69b21fb54e0aba2b559d4329e03f20935b8109a946bcf6063996f6f42a25693c3f2ad62590ff6bbb1a379

View File

@ -0,0 +1,11 @@
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp 2021-12-11 00:27:36.689228241 +0000
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp 2021-12-11 00:27:43.649215279 +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;

View File

@ -150,9 +150,10 @@ src_prepare() {
rm -rf "${S}"/src/jdk.hotspot.agent || die "failed to remove HotSpot agent"
fi
chmod +x configure || die
eapply "${FILESDIR}/patches/${SLOT}/make-4.3.patch"
eapply "${FILESDIR}/patches/${SLOT}/aarch64_gcc_fix.patch"
chmod +x configure || die
}
src_configure() {