forked from andrius/gentoo-bootstrap
icedtea7: add aarch64 hotspot patches.
This commit is contained in:
parent
341c9210f7
commit
0c0a054a6d
|
|
@ -6,6 +6,7 @@ AUX icedtea-jdk-fix-build.patch 2150 BLAKE2B ebfc48db63836bd3f60f946ad2a647ddfa3
|
|||
AUX icedtea-jdk-musl.patch 4861 BLAKE2B 40028881fd456a7643501aee235e015039ea7e363c094bb0a23cab2faae1e8ae72501d562f6366f1630c3d1d08f7ee31f05bc95e802be7e146976d9087a07358 SHA512 44a35941c80f408d0607e32763b3b6ccee21e1d39886309327d3d74d2900117e4346ef59e77c663fd022fec10ee8f365eeb46c1260014d5765d226ce175ce3c5
|
||||
AUX icedtea-jdk-no-soname.patch 369 BLAKE2B e44f1f539abd742963664a6f64cdd8aaaa7b108b20535ca0a5a20b0892a083e81b676fd1c71a6b021b2fa1f15404520be388f14ac326ac909f0a11f1aac20864 SHA512 bf4b184e170f7b0ff64ab30d2162784fe2bd5460d1fa31973259f7065fd4c511c46f97724fe2bd72bb94e9006cb568d0e0c87d1a9c90819e65880f8f44830bb1
|
||||
AUX icedtea.env.sh 1130 BLAKE2B 8ffd3a9c558b9abb9df723efc531496537d7883d676c145411d9a4f02ecd6826c5edec9451ced8187224a9c24b408e6cbad3dc11ebcbe2f69a38b0966cb691c7 SHA512 79c279338cc2790df91c92d8d9b97c007f1a030374066dfacbbb2f9aac754eafba9197b748adcb9fe6fbff16bd998b6536298443028df281d1b12d3b348da66f
|
||||
AUX icedtea7-hotspot-aarch64-use-c++98.patch 1338 BLAKE2B 7b438b2f1e3cfd13d278df390152eb84d8976d131c04bf05a9ace873adf83d06aa615e1f96e3a6920e19a7c67339aab0fd00d8fe3ce48eaf34975e98d20484bf SHA512 179e2abc2d4befacb0da7ed77f2265165c1d0f4b87782152ff037b011cf6e1bafeb32fd20ef16c2aafc39b15a7d3f0f75a6828183fb7862b6b2a40eb3f409ca7
|
||||
AUX icedtea7-hotspot-miscompile.patch 857 BLAKE2B 5e2297146aa6be2aa0380169438341f69eb4c6307ca89b2a4378579145f9c413b25ee1af823105d78668506721b2d70c2cd84f06efb4021352d127d528b2dd6e SHA512 072c65e645ce23fa1f5536357ebe5cca155fe515aa487170d034fbcfab6195a5d2ec26cc5e3212530137208db091cb842a316b5af24c5191ae1e22b45a16f17a
|
||||
AUX icedtea7-hotspot-pointer-comparison.patch 1600 BLAKE2B afc83c45a80a8adf3f8a0cbfef23cacfc1e716adef70bb8d7be3cab6c7ebd765b9becc1a27c5b64d16440090ddaf7777f7b1ae675b9e0fb922cd9adea68fc5a2 SHA512 2325a5bf404c1c7cbe94d2837d18f15d07bcff99434d29b3fdebb189f273d09597e33820d5c0ff2912a9a9921b442bbe8a9c73f528774d0d82e5be039d93cc76
|
||||
AUX icedtea7-jdk-fcommon.patch 389 BLAKE2B 9e8936c9843b3c5e04b56268a5bc84a6213b0fbb594def7869d9e4ae1820e57b1cc8c4e4a60d3bb3c371bc241a44c409289eb5d6f3dd2edd9bf9ebbd9dcd5f32 SHA512 6fdc7dcdfd5d0c11e180ea5cbff3fad287c0dd5866ecf3aed3e271e343f78d4cfb3fd656c146fec72fd6e5e43d98961f34c53111c9407bf17fbdff18215e7d39
|
||||
|
|
@ -45,4 +46,4 @@ DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 BLAKE2B 5c1faa3cbbfea62f819562a01
|
|||
DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
|
||||
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
|
||||
EBUILD icedtea-3.7.0.ebuild 14544 BLAKE2B 644ac218fab4963db958f442d3c294818bc5aa579b0547c5a88b8cfb0553823065ae4c57f5da34422c8ad8516b2bfd25b6d86f543ac82b825590038f0544c5c8 SHA512 8c014f7bd04643abfadf1b8f4ec259acd5898111eb38f42d48f92c19b7355d4b7ac1468d2e9cace04a3060a3ab0228e921ee689dab023c131cda55b84073e655
|
||||
EBUILD icedtea-7.2.6.9.ebuild 12931 BLAKE2B 274ddf6ac7df798cf3d96aa762dbb82b2ce36572d9e2814725e5f06ce31d10a66933d9380394222e8cf6f08ee13906c464aed81c5231970e0d1e2d8e0d4cc392 SHA512 e2449625973b9980f1d5241e0f2d02539d6b90c3bc225142cf67b511298bb472f69b5880601a2c5bfe118579ae6ccc1af642f7dc80fa596ad096cba960dc1ab6
|
||||
EBUILD icedtea-7.2.6.9.ebuild 13098 BLAKE2B 4faf61d794692201657305b37781d729d989119191fdb7f3d4abb1639b873d517569f6490844f14b5b33b32fa0c644be710cffcea16b9690407742a4745372bc SHA512 d49755aa7ac493c60f9e524e9ad6113673729c347532bcf17adceddbc3e90f12033cf9bacb83696a36c9567389091e166b674b5d2fd88295824759479cd3ad18
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
From 919dd016be1abd213b3a7d0e9a3b79e3286ef6ad Mon Sep 17 00:00:00 2001
|
||||
From: Simon South <simon@simonsouth.net>
|
||||
Date: Wed, 10 Jun 2020 13:02:09 -0400
|
||||
Subject: [PATCH] aarch64: Use only C++98
|
||||
|
||||
This patch removes an unneeded C++ template that causes the build to
|
||||
fail for aarch64 using gcc 7.5.0 and its default support for only the
|
||||
C++98 standard.
|
||||
|
||||
It is based on original work by Severin Gehwolf <sgehwolf@redhat.com>.
|
||||
See: https://bugzilla.redhat.com/show_bug.cgi?id=1307224
|
||||
---
|
||||
src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp b/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
|
||||
index 0bc0a2b..6f73ca0 100644
|
||||
--- openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
|
||||
+++ openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
|
||||
@@ -194,10 +194,6 @@ static int reg2offset_out(VMReg r) {
|
||||
return (r->reg2stack() + SharedRuntime::out_preserve_stack_slots()) * VMRegImpl::stack_slot_size;
|
||||
}
|
||||
|
||||
-template <class T> static const T& min (const T& a, const T& b) {
|
||||
- return (a > b) ? b : a;
|
||||
-}
|
||||
-
|
||||
// ---------------------------------------------------------------------------
|
||||
// Read the array of BasicTypes from a signature, and compute where the
|
||||
// arguments should go. Values in the VMRegPair regs array refer to 4-byte
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
@ -178,6 +178,7 @@ src_unpack() {
|
|||
ln -s "${FILESDIR}/${PN}${SLOT}-hotspot-pointer-comparison.patch" "${S}/patches" || die
|
||||
ln -s "${FILESDIR}/${PN}${SLOT}-jdk-fcommon.patch" "${S}/patches" || die
|
||||
ln -s "${FILESDIR}/${PN}${SLOT}-hotspot-miscompile.patch" "${S}/patches" || die
|
||||
ln -s "${FILESDIR}/${PN}${SLOT}-hotspot-aarch64-use-c++98.patch" "${S}/patches" || die
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
|
|
@ -210,9 +211,10 @@ src_configure() {
|
|||
DISTRIBUTION_PATCHES+="patches/${PN}-jdk-fix-build.patch "
|
||||
DISTRIBUTION_PATCHES+="patches/${PN}-jdk-execinfo.patch "
|
||||
DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-jdk-freetype.patch "
|
||||
DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-hotspot-pointer-comparison.patch "
|
||||
DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-jdk-fcommon.patch "
|
||||
DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-hotspot-pointer-comparison.patch "
|
||||
DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-hotspot-miscompile.patch "
|
||||
DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-hotspot-aarch64-use-c++98.patch "
|
||||
|
||||
export DISTRIBUTION_PATCHES
|
||||
|
||||
|
|
|
|||
|
|
@ -105,5 +105,5 @@ EBUILD openjdk-15.0.0_p36.ebuild 8645 BLAKE2B 8a4516e98f32bb038b6a5b0123bba46158
|
|||
EBUILD openjdk-16.0.0_p36.ebuild 8496 BLAKE2B a98e9f85c96b6d0098ce21e337b5764c88c9933eb8abf94c0906430b60a85657360fb903eec0973262a268b8781324deea8d21a9025e91dbdf19796dc07b9c27 SHA512 b02a2fed9ae8ff387ae6691e21f2dba0b3f3cc1c636a9c5ea328f9dd41effb11e809bc77ca0ac84e980f07480413066b1f76f5f3f923d32e290ecb757f8fa687
|
||||
EBUILD openjdk-17.0.0_p35.ebuild 8437 BLAKE2B 630c114db9825acc447a637fced52c7dd72e272243b71b5c8c154e005d363663479cfa0477357981ebed87d40548b3c179329af26538f12fa16cc83bb17d3718 SHA512 59689cbc3133200fb0bde1cd8e5c113abd5488105e75aaaea6166942067a04710e9326da7a9f2ade02d0fc8308b00ce1d3ce2e902a7a4bbcc15830be8f891b22
|
||||
EBUILD openjdk-8.272_p10.ebuild 8142 BLAKE2B aab86f22139e847331a358065fc42da80385a3cffe937ee5cf68703f242117641f4d89d67bafb396cd2ec908e07be9e5b17b8c98e777308c3293ad9b7b3ca3c7 SHA512 06210cb2ba5f910a32abb400b8c9a6523899f3f23ad5785940e1de8f823d36767556a3af7b542670bef4a18a0f7c9421bbdaa214bcf7f605c49b3e7cc1418b9f
|
||||
EBUILD openjdk-9.0.4_p12.ebuild 8324 BLAKE2B 4f8244d2297ed6e9d5d73c36a13f41fcb34a49dc1c1dcfb21634dde9d15dd64d55c5a13db8551f8b5d6cebb34f8ef7ad3eed33f801bc5b038fa23b4e582faea1 SHA512 fc8d4c283bcc52146e98bc09992db5cda4697c0973330a77ab51d54dab4b4dd1b4f4d6a9674380cb0e935de25be0719c6194a3413af20646f793cbface0a4c46
|
||||
EBUILD openjdk-9.0.4_p12.ebuild 8464 BLAKE2B a960842624e0d036e89c936e73c2dbbccdf2d268af46ec4158cf40f5da1085711176410a8432291aaf77b5525fa2d9eca7389d666646b2b7fafa984512b59ae2 SHA512 2e63252c88ad2cfb4beeecfd1298ec9737795e941c19d54e8745cf86c65149f4385d87493d299d9a6a87f71f69e36270c7e72371b5074ed90c0911666c0f00dd
|
||||
MISC metadata.xml 1432 BLAKE2B 36a11642c99127a5f97fc0b095a142705c6b4e077ed24604f1886e4d1beaa47b4fa30359600797d5e6a085befd11a2851196fe97a75a0f0907461679946b4cbf SHA512 ecc66015da3a0fc616b91dd5aaffb5b050c9f66e936cad02ec12fb56dd7c6b3b3c331d8856402c0deee16c415ea083e088cce7414703f9d659f551883b055ff0
|
||||
|
|
|
|||
|
|
@ -172,10 +172,17 @@ src_prepare() {
|
|||
# https://bugs.openjdk.java.net/browse/JDK-8237879
|
||||
eapply "${FILESDIR}/patches/${SLOT}/make-4.3.patch"
|
||||
eapply "${FILESDIR}/patches/${SLOT}/pointer-comparison.patch"
|
||||
eapply "${FILESDIR}/patches/${SLOT}/hello-class-list.patch"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Work around -fno-common ( GCC10 default ), bug #706638
|
||||
append-flags -fcommon -fno-delete-null-pointer-checks -fno-lifetime-dse
|
||||
|
||||
# Strip some flags users may set, but should not. #818502
|
||||
filter-flags -fexceptions
|
||||
|
||||
tc-export_build_env CC CXX PKG_CONFIG STRIP
|
||||
|
||||
# general build info found here:
|
||||
#https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
|
||||
|
||||
|
|
@ -187,8 +194,8 @@ src_configure() {
|
|||
--disable-warnings-as-errors
|
||||
--enable-unlimited-crypto
|
||||
--with-boot-jdk="${JDK_HOME}"
|
||||
--with-extra-cflags="${CFLAGS} -fcommon -fno-delete-null-pointer-checks -fno-lifetime-dse"
|
||||
--with-extra-cxxflags="${CXXFLAGS} -fcommon -fno-delete-null-pointer-checks -fno-lifetime-dse"
|
||||
--with-extra-cflags="${CFLAGS}"
|
||||
--with-extra-cxxflags="${CXXFLAGS}"
|
||||
--with-extra-ldflags="${LDFLAGS}"
|
||||
--with-giflib=system
|
||||
--disable-hotspot-gtest
|
||||
|
|
@ -239,7 +246,7 @@ src_install() {
|
|||
rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
|
||||
fi
|
||||
|
||||
# stupid build system does not remove that
|
||||
# build system does not remove that
|
||||
if use headless-awt ; then
|
||||
rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
|
||||
{,jre/}bin/policytool bin/appletviewer || die
|
||||
|
|
|
|||
Loading…
Reference in New Issue