From c2feaec95728b199572d440eab3da260aedcc98c Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Tue, 30 Aug 2016 10:54:11 +0200 Subject: community/openjdk8: fix build on aarch64 --- community/openjdk8/APKBUILD | 6 +++--- community/openjdk8/icedtea-hotspot-musl.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'community') diff --git a/community/openjdk8/APKBUILD b/community/openjdk8/APKBUILD index 3d2ae0b76e..1bd127f2e5 100644 --- a/community/openjdk8/APKBUILD +++ b/community/openjdk8/APKBUILD @@ -255,7 +255,7 @@ e2143b152be03f3ec66313294606c100 jdk-3.1.0.tar.xz 39c75541d8bbe9be9cfd7f58c0950641 langtools-3.1.0.tar.xz d4d70521fee922201c309a64be22b239 hotspot-3.1.0.tar.xz 3c266698f3b192fd5616ce9548d1ead2 nashorn-3.1.0.tar.xz -f87dd2c4c3c97fc3ac33080a65ca9e14 icedtea-hotspot-musl.patch +2f4a5b0ec7a2bf7ab609da10b86dca4c icedtea-hotspot-musl.patch bd148291e75d536972cb2b1b68e5cb05 icedtea-hotspot-noagent-musl.patch 43023861c5f6efc3139a834aa3ec0476 icedtea-hotspot-uclibc-fixes.patch bdea7060a067faf1c2de5f4eb6e8525d icedtea-jdk-execinfo.patch @@ -273,7 +273,7 @@ c19f7ffaec510db20b3c66b6447040012c28df319ab1dcfaf0a41c0e807bdddc openjdk-3.1.0. 2a7f8dd0b0c1b256c58b8e841033b7915beb08d983350f9a9357115a05677f1d langtools-3.1.0.tar.xz 33581ea3ef4deffa786be82e110ae3d6b0431cc56140eb51453af1f11962b174 hotspot-3.1.0.tar.xz 56b36f5f7c073b140f8316084a23080553d8790d9f1f7e6d6288c6b0fd45cd7f nashorn-3.1.0.tar.xz -a7922430cb767c8a4baae232c8b2e5f377aeb7cfde0c9901cd7774f078e7f92e icedtea-hotspot-musl.patch +ed114e8d00d6ed1295f5995df02ad13d3d0cd242f7a904600d93b6564856f8df icedtea-hotspot-musl.patch c14529a29bfdfb51bf5b4a41c977039073f470758e31235d043d373b48d46a11 icedtea-hotspot-noagent-musl.patch 0ef7592b8f2c954eda0a6cf4dc4a4010942f35ea426f44e34412be6c9a949745 icedtea-hotspot-uclibc-fixes.patch a35d40f24098747cdb73d9c3742cfb4aecafa0f72c9dfdfe2cb460f9706ff665 icedtea-jdk-execinfo.patch @@ -291,7 +291,7 @@ e7e605937292f37aa8a5510f3bfda20ccdeee17d6cbe5a69260eddbb7f39733ef9dd7d91ffd3e968 c6eb7b5287cb7dbf518ac9d7167b9e63df086b9abe893adfc72b7ba5d9e0a16861fa72b5fbb46ce58bd02cf837b81d03cd1b860dea947a9e58ff39a8d62411ee langtools-3.1.0.tar.xz 8fcd3934afb446cd683f991f99c2b22fbeee607a1221665d7300d1e8d53740d7d2fee7894ccc53cddb02b902acaff68fd3ca1454dc244feeb641f5d5fd6308b4 hotspot-3.1.0.tar.xz 61f060f02a8852681212ac26018de0ad3403156f9c1fb984c658fa31bc4e58a0da588188c57d629da022b32c763c2f5915a8938997c6f94b127ceacde8d050f9 nashorn-3.1.0.tar.xz -994e8a79a0a23f26d633bf2ce9dad62198c699892f6e7729cc6e509481330399bb2ba736514b516fd2b3dd125fd6c74a127ae7f16d643c3f6a69776737cdb933 icedtea-hotspot-musl.patch +ada3bc4024682bfb86ebf3850d3a36cf4c0f0677a6d56eac2e0959b92bfe759010d5b9c801b043cae3ca8418d7819546ae245ac163df83e48c5d4b34478daeb0 icedtea-hotspot-musl.patch 3c592a14f1806a431290a96a8c1413ca1cc621e73a87ed778fa98878c82809bd924072210d4e4127a6c0c32ff557d749f6c9b3ce31cbca083b013240b618b224 icedtea-hotspot-noagent-musl.patch 822eee0dc4d3ba677a289dfeb3668b536d2d626708390a9d9702fb4144a481fd443a215a0d2041c6026113837aafa4ba0b5e9ead8589d2da6717a238bbc95a5a icedtea-hotspot-uclibc-fixes.patch f6365cfafafa008bd6c1bf0ccec01a63f8a39bd1a8bc87baa492a27234d47793ba02d455e5667a873ef50148df3baaf6a8421e2da0b15faac675867da714dd5f icedtea-jdk-execinfo.patch diff --git a/community/openjdk8/icedtea-hotspot-musl.patch b/community/openjdk8/icedtea-hotspot-musl.patch index 41072defe2..af64b27c03 100644 --- a/community/openjdk8/icedtea-hotspot-musl.patch +++ b/community/openjdk8/icedtea-hotspot-musl.patch @@ -53,3 +53,14 @@ 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 + # include + # include +-# include ++# include /* provides __u64 */ + + #ifdef BUILTIN_SIM + #define REG_SP REG_RSP -- cgit v1.2.3