forked from andrius/gentoo-bootstrap
openjdk-10: unconditionally apply patch to support make 4.3.
This commit is contained in:
parent
9ad1c4f44c
commit
d81e5c5d95
|
|
@ -0,0 +1,55 @@
|
|||
--- openjdk.orig/hotspot/src/os/linux/vm/jvm_linux.cpp
|
||||
+++ openjdk/hotspot/src/os/linux/vm/jvm_linux.cpp
|
||||
@@ -154,7 +154,9 @@
|
||||
#ifdef SIGSTKFLT
|
||||
"STKFLT", SIGSTKFLT, /* Stack fault. */
|
||||
#endif
|
||||
+#ifdef SIGCLD
|
||||
"CLD", SIGCLD, /* Same as SIGCHLD (System V). */
|
||||
+#endif
|
||||
"CHLD", SIGCHLD, /* Child status has changed (POSIX). */
|
||||
"CONT", SIGCONT, /* Continue (POSIX). */
|
||||
"STOP", SIGSTOP, /* Stop, unblockable (POSIX). */
|
||||
--- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
|
||||
+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
|
||||
@@ -73,7 +73,6 @@
|
||||
# include <pwd.h>
|
||||
# include <poll.h>
|
||||
# include <ucontext.h>
|
||||
-# include <fpu_control.h>
|
||||
|
||||
#ifdef AMD64
|
||||
#define REG_SP REG_RSP
|
||||
@@ -532,6 +531,9 @@
|
||||
|
||||
ShouldNotReachHere();
|
||||
}
|
||||
+
|
||||
+#define _FPU_GETCW(cw) __asm__ __volatile__ ("fnstcw %0" : "=m" (*&cw))
|
||||
+#define _FPU_SETCW(cw) __asm__ __volatile__ ("fldcw %0" : : "m" (*&cw))
|
||||
|
||||
void os::Linux::init_thread_fpu_state(void) {
|
||||
#ifndef AMD64
|
||||
--- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/threadLS_linux_x86.hpp
|
||||
+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/threadLS_linux_x86.hpp
|
||||
@@ -32,7 +32,9 @@
|
||||
// map stack pointer to thread pointer - see notes in threadLS_linux_x86.cpp
|
||||
#define SP_BITLENGTH 32
|
||||
#define PAGE_SHIFT 12
|
||||
+ #ifndef PAGE_SIZE
|
||||
#define PAGE_SIZE (1UL << PAGE_SHIFT)
|
||||
+ #endif
|
||||
static Thread* _sp_map[1UL << (SP_BITLENGTH - PAGE_SHIFT)];
|
||||
|
||||
public:
|
||||
--- openjdk.orig/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
|
||||
+++ openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
|
||||
@@ -75,7 +75,7 @@
|
||||
# include <pwd.h>
|
||||
# include <poll.h>
|
||||
# include <ucontext.h>
|
||||
-# include <fpu_control.h>
|
||||
+# include <linux/types.h> /* provides __u64 */
|
||||
|
||||
#ifdef BUILTIN_SIM
|
||||
#define REG_SP REG_RSP
|
||||
|
|
@ -2,7 +2,6 @@ AUX bootcycle_jobs.patch 1273 BLAKE2B 4ff4b9f629167230aa0800da4559b1d31028924971
|
|||
AUX musl/10/aarch64.patch 278 BLAKE2B efe0e23db53c8bfc6bb7c54268428729cfbe2968615ff1ea1d918f357ab3d6000dab0dfd9670a66005f158525ea5a679cb7ad26fd5cf096fae0b23538d79232a SHA512 479d0183aece1ca3f41d4eb9e9bf69d3d0fc2668e32d8b826ae3bd117da5d83241868e8b0cab6773cb87bd7403f17d519cc190c530a783b51f28a6aee0272bea
|
||||
AUX musl/10/build.patch 19515 BLAKE2B 5fa8b50bf86771f1b20023cb850081e05e73942552cd17520829593fcbe376e43257182ca339f24c7375b21ecb17490ee28155d9d63e806825802198704c0034 SHA512 792dd959f98bd81250b568ea1972374431963cec16d8a9955e1aece71a0a4a06446cd7cf879273760eddee65561d0cf6c54cb25824bec389657e7fe05335896b
|
||||
AUX musl/10/fix-bootjdk-check.patch 25760 BLAKE2B 91bf753a207cc4dd9aae821be000f4eacd87ee8048db3e2f5968903ffb408dc618fb6d3ce056df60348a8e7391a91caca2b14364bfe5087e1dcac1485bc60f24 SHA512 b683d61a5d586c2557834816410b58f27067ce8fe71d68df6d492bf4f730a21bf913cade4bbaf368be16fc6b3b76d8309012a4735fe0431b2abc95c4d8f059da
|
||||
AUX musl/10/make-4.3.patch 741 BLAKE2B 6dab3601e6a6260f9813fab663211d8afe7fc08ff1af243bbd8ad90f8c58df5c713aec5cea7788eeabee9fce17e0aec5cf9b6f19becd5baf37a772773a445b36 SHA512 7d6ada121fbd7a4b29459b000fca225b3fb7d95d855459d43749d6ece60b8282418bd349cf235ccd41b86ac36b158e81f3184884883a551c240cb30dfe66fccd
|
||||
AUX musl/10/ppc64le.patch 6466 BLAKE2B 528ab05c6ac6101e250f4a5ff2ca065e07f560898bdceeb9c681152eb959e0030afe8e000bb06285f51294e052e50781ca99bf58af3fb1e316b34db8c70a77ee SHA512 25a91b821fa4d08d3b2c0c1fb4ecfc8aaf611837517fbaed7d90be2fdb1892b55a0ef44553dc543dccb2e104a14bc42434f9a393a72f3e66abc26db30916ce60
|
||||
AUX musl/11/aarch64.patch 462 BLAKE2B 6f73eaf1b07417fcd9d980cc3ab7612e1863c2120e7913a5d70dbaf29ce282476ad5e5b59f5796a6ec475c62d44e7c78ed54b21525a5f9974459ed4ec7ce9f9a SHA512 7233c538cfab3eabe01dd4ba3ed59ddc8b60270274230f2e63ddabefd870236289589546cb1a889e03875425702a7c53c8a729c464e8e9b7ce1e8da3458498c2
|
||||
AUX musl/11/build.patch 19836 BLAKE2B b5349e5dadd19ca4c844dd549f356f2717305416e829ef93909a125288813cda33a0c6b930396f00b08df0a03ac49224303d8cdc47a4833d2ba4897326bfd9eb SHA512 af9a6b367182880bb31bf4828d8f8fbede384b10a29f9f4aeb6e9e0ff6740745f2027ce52cf548884891ea85c455fe3453ae4e9835af4d52fad94b049ad2f932
|
||||
|
|
@ -59,6 +58,7 @@ AUX openjdk-17.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603bee
|
|||
AUX openjdk-7.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd65c64469b3a49a520686ff8d884c0b3d5dd9017ff4027d2fc1d78d57f062a4cf8910e0bab3ed444cc SHA512 2c65d1875406deabbfadb798501de15850775a4a049f073cdfda684ca1bff4b531b93596ee91a7caf77ff6c377457093f72c7bde4b995bce9ffbc4a8fcceb6dd
|
||||
AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd65c64469b3a49a520686ff8d884c0b3d5dd9017ff4027d2fc1d78d57f062a4cf8910e0bab3ed444cc SHA512 2c65d1875406deabbfadb798501de15850775a4a049f073cdfda684ca1bff4b531b93596ee91a7caf77ff6c377457093f72c7bde4b995bce9ffbc4a8fcceb6dd
|
||||
AUX openjdk-9.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
|
||||
AUX patches/10/make-4.3.patch 741 BLAKE2B 6dab3601e6a6260f9813fab663211d8afe7fc08ff1af243bbd8ad90f8c58df5c713aec5cea7788eeabee9fce17e0aec5cf9b6f19becd5baf37a772773a445b36 SHA512 7d6ada121fbd7a4b29459b000fca225b3fb7d95d855459d43749d6ece60b8282418bd349cf235ccd41b86ac36b158e81f3184884883a551c240cb30dfe66fccd
|
||||
AUX patches/16/1001_ppc64le.patch 9158 BLAKE2B 6bf533c332ac2684216c394e13008bc8d806f2d938b94052cf7f8b267afe585b2bc607b3721c135c7516916595a5ab6ac84fcd96db5754c6cc05279c8c993698 SHA512 05845450afd2d8be9f9f3a69d24c92f2e18593beeb43d748efee53e92edaedacdde2bfcf46b07eb702e036fd3defe2e6418628c26d8e6114653aa521a5d309ce
|
||||
AUX patches/17/1001_ppc64le.patch 9158 BLAKE2B 6bf533c332ac2684216c394e13008bc8d806f2d938b94052cf7f8b267afe585b2bc607b3721c135c7516916595a5ab6ac84fcd96db5754c6cc05279c8c993698 SHA512 05845450afd2d8be9f9f3a69d24c92f2e18593beeb43d748efee53e92edaedacdde2bfcf46b07eb702e036fd3defe2e6418628c26d8e6114653aa521a5d309ce
|
||||
AUX patches/9/aarch64_gcc_fix.patch 377 BLAKE2B b94336be65f16831c63cb3288d71b48c9c0c12e91a3612501895b924791d41c94eae1cae35e64ff03f7ba873463d78fff09652c4fe2f0bc749697d82f9ea4e8b SHA512 d4666e419559b10d4d2c0b3ec7b10ce6607e8480ffac6a8685263e0997d8bd43b059244f1beb452759a8a2e86a867d03e5e44793b62b2fe0a4a3dc00a5dd6ad9
|
||||
|
|
@ -98,7 +98,7 @@ DIST openjdk-langtools-8.272_p10.tar.bz2 2399755 BLAKE2B 34ffa30993fa9f42ed2fa96
|
|||
DIST openjdk-langtools-9.0.4_p12.tar.bz2 4497608 BLAKE2B 382bfa6119345f1983cf5a168fa0d2e523a6dad5ad35f446cd11d6f6f24bb5850e65d1d0aab7fe8298ba7a2d7fe3ebb8a472c567a46577dff17ab80ea32abae9 SHA512 ef3c70be906a4b0dd9c9195c88da045909ee3ef144941fb7b4495ed66b4162f481095cad87626d2bd38e5a62134b440223cd008dd6123b6b43c00e338610a692
|
||||
DIST openjdk-nashorn-8.272_p10.tar.bz2 2850055 BLAKE2B 2348c0f45916101d9fcb4aaa283d2c03be5b28decf12248ec930b9d726e346d0884dd64a22627e2f2fd8260c8755d0bc46a1cf6fecf691a30a7f4b54f6a293a9 SHA512 754fcdca5e0ce523d73cbdfbdcaaa13677ed8c2b72c5ae04ff1cc77fd73469f3366e51add68b13bac3c43800fecfcbb93bf4fcf7469258c4adc57e414b105ef5
|
||||
DIST openjdk-nashorn-9.0.4_p12.tar.bz2 8961760 BLAKE2B 2ff03adf87a0e0561d52529cf95b8fb827e75773462be7ecddd60dc966e1a229b897eb65a0301a531dfcaff884122e612f1a24b5d5fbc8f0352a8d84218423d7 SHA512 848c6ece418e250561572ad704baeb565580098cfc5f849d4e1a3b41b916aae3487eb4d8d0b319f3a503d122ec064ed4de0678d06821c9a2bdb09c990e589c97
|
||||
EBUILD openjdk-10.0.2_p13.ebuild 8120 BLAKE2B 6fec764700070b41df10f58bb549f043fbcae7a1fe3e80e7b0a0dca69b0d05ef2b6e896306eb9ab173839feb32ca7f1e86c45f0f76fb83fe9bc149d877afb90f SHA512 fa15a5d024c7c6b121604994c029bec3e8b6f1123d9bf6e9d8d4662e1d3479a6ef2832bba730ee52446fdde743959ed41babf218d950f7e973653bb366b42c23
|
||||
EBUILD openjdk-10.0.2_p13.ebuild 8123 BLAKE2B 7ba47ef8b888b78d6d149623152891b7d4cd22c8edf3ddb29deda11a6a48b6c3171af5fb2ac68b7d49e58a787871c056f3367ddac0f7302938a6fd734db410bb SHA512 7890b7605348364d3698420fc60a216b6bbfe6f2d147d63dea3dae51a78540cffdd320a314006125fdfab373997478b1173dd2b3eb62e830666639bfeed6e5a1
|
||||
EBUILD openjdk-11.0.9_p11.ebuild 8267 BLAKE2B 0f1f87fe2b582541346c9870c73079a4430853ed6d1665b1ba2bb369d3ade6cd72916e8f36bf0afb0b80d95c6acea3577ca02ba16da6dba2b4b5de9a5aedfbc0 SHA512 175bf0542ea4106dfb1fff50ba9d21b4f91ae0df83c0d4153d0f93f5f078588f722f09061380391a38c886958d4b12acd2a0615cc354064ce573f44b81758635
|
||||
EBUILD openjdk-12.0.2_p01.ebuild 8436 BLAKE2B dfe25378ceff511abb9fbff5a7753315137ae1878b05f4d5f1581861515719dea8c0c814330413ba6b2bf54062c90b59cf86e7218e5ce179195be2db2845fd4c SHA512 76fbc83bf49e239c611d8f14653abe17d1a416b83d87e9083105bbc5d914b14604bcad2c439aaa17c8819ad07ec438c87b3223e7e6345a7cc728d16dade3af40
|
||||
EBUILD openjdk-13.0.4_p01.ebuild 8417 BLAKE2B 521f065801713eec3290d6fca3ae224f8fae56c026dedcc9e609d9ad92bf2c21ba195d785b8936a1099bb69109fc744132e8876f8e15dcd85f8304cbf1771c4e SHA512 5c08b3a707929881bdac4b8759851f4f0b80482245890568149adadded1e597a8260e707264cf85ea082f610a1f290ca9a00961f78af38466e433f867bd8a8c9
|
||||
|
|
|
|||
|
|
@ -136,7 +136,6 @@ src_prepare() {
|
|||
if use elibc_musl; then
|
||||
eapply "${FILESDIR}/musl/${SLOT}/build.patch"
|
||||
eapply "${FILESDIR}/musl/${SLOT}/fix-bootjdk-check.patch"
|
||||
eapply "${FILESDIR}/musl/${SLOT}/make-4.3.patch"
|
||||
eapply "${FILESDIR}/musl/${SLOT}/ppc64le.patch"
|
||||
eapply "${FILESDIR}/musl/${SLOT}/aarch64.patch"
|
||||
fi
|
||||
|
|
@ -149,6 +148,8 @@ src_prepare() {
|
|||
rm -rf "${S}"/src/jdk.hotspot.agent || die "failed to remove HotSpot agent"
|
||||
fi
|
||||
|
||||
eapply "${FILESDIR}/patches/${SLOT}/make-4.3.patch"
|
||||
|
||||
chmod +x configure || die
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue