diff options
| -rw-r--r-- | testing/openjdk11/APKBUILD | 13 | ||||
| -rw-r--r-- | testing/openjdk11/ppc64le.patch | 24 |
2 files changed, 24 insertions, 13 deletions
diff --git a/testing/openjdk11/APKBUILD b/testing/openjdk11/APKBUILD index dd733d3a0b..6d99306aa4 100644 --- a/testing/openjdk11/APKBUILD +++ b/testing/openjdk11/APKBUILD @@ -3,10 +3,10 @@ pkgname=openjdk11 pkgver=11.0.4_p4 _pkgver=${pkgver/_p/+} -pkgrel=0 +pkgrel=1 pkgdesc="Oracle OpenJDK 11" url="https://hg.openjdk.java.net/jdk-updates/jdk11u" -arch="all !x86 !armhf !armv7 !ppc64le" # openjdk10 is not yet available on 32 bit arches +arch="all !x86 !armhf !armv7" # openjdk10 is not yet available on 32 bit arches license="GPL-2.0 with Classpath" makedepends="autoconf bash @@ -44,7 +44,6 @@ $pkgname-jre-headless:_jre_headless $pkgname-jdk:_jdk" source="jdk-$_pkgver.tar.bz2::http://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-$_pkgver.tar.bz2 -2019-01-05_config.sub::https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;h=3b4c7624b68d2d7f84618e1b5fa2badd43a48325;hb=286a38db91ea2dce1749ab7d1d9ea5ae344a16c1 build.patch aarch64.patch arm.patch @@ -75,8 +74,9 @@ fi prepare() { default_prepare - # update the config.sub file to detect alpine - cp $srcdir/2019-01-05_config.sub make/autoconf/build-aux/autoconf-config.sub + # update autoconf files to detect alpine + update_config_sub + update_config_guess # remove not compilable module (hotspot jdk.hotspot.agent) # this needs libthread_db which is only provided by glibc @@ -308,11 +308,10 @@ _jdk() { } sha512sums="3f64c8911d31214c2f07b359b57c08117597cf22e078f640b4d741b8d60c5926c6bd22f2612b54502eb14afb30e5f2012f12a69f5b77aea6273fd36fc2a5bc24 jdk-11.0.4+4.tar.bz2 -74e3d868d766e605921542969dd2f646a8adec1b82181aaeb02b623a524cb9011e44c261d4e13ab24268c79c6bc1d260e62d41a928b1b402b186dc5676272e36 2019-01-05_config.sub 66a9f2736da87de09d7bcc136771ab760bdba7847f3a23b2aa4efbc2e55ac8b49510c6d7afdf3f8d046c6e3fe9dca0d4cb0b5a38d7a3aebaf86fa0e3cc635eac build.patch 8c0f1f8d2a78ebb30a8460bc0ea9cd2349cea98819df1577bf7de19a1dd82d06a593f36b4e17c282ed53d23f00163e387e3dd1f3c9e5a092726e78c3aa710370 aarch64.patch d2903a5b3b9f82c4888416580f0b93888bf21ae0dac0ce6e926607a82a9e53b7e10e13f07a984f65dc116e81f58cd3844d6156088534c0059be8f6ee68e19a43 arm.patch -e9a9aeb7d4974ff0e20afa5fdb4515f3c557b71362b8d91aa16adb073eb11ba47665b2b2a152001ca6f01fc732e490e84d8043d42f7ddab678494a31b5e167c8 ppc64le.patch +4eb577645e7b6d4563290480e162702030033515ff4845edbd1dbf2604b6f1e7d2a3cdd85058d6b41938b54c097635125c4429b9df3fcda589b980aa1740fd2e ppc64le.patch 89e681da2de0bcb5131e2512d1280ce8da684ede5b38379c6325cd9f57e78a4bdde3abfa0a0a496889411dd57264312094973ce2da301293d0826114a3ef09d3 x86.patch d1767dddd8e0956e25c0f77ed45c6fc86a1191bae1704a6dc33be490fd20eaa50461fe5c2a3349512059d555651e2eb41437dd3c1096c351e8ee68b4534a2579 HelloWorld.java 27e91edef89d26c0c5b9a813e2045f8d2b348745a506ae37b34b660fa7093da9a4e0e676ea41dc4a5c901bce02e5304d95e90f68d6c99cbf461b2da40a7a9853 TestECDSA.java diff --git a/testing/openjdk11/ppc64le.patch b/testing/openjdk11/ppc64le.patch index aebdb580da..88ee55ae05 100644 --- a/testing/openjdk11/ppc64le.patch +++ b/testing/openjdk11/ppc64le.patch @@ -60,7 +60,7 @@ } --- old/src/hotspot/cpu/ppc/vm_version_ppc.cpp +++ new/src/hotspot/cpu/ppc/vm_version_ppc.cpp -@@ -743,7 +743,7 @@ +@@ -768,7 +768,7 @@ unsigned long auxv = getauxval(AT_HWCAP2); if (auxv & PPC_FEATURE2_HTM_NOSC) { @@ -71,7 +71,7 @@ // POWER9 DD2.1 NV has a few issues that need a couple of firmware --- old/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp +++ new/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp -@@ -110,24 +110,42 @@ +@@ -108,24 +108,42 @@ // - if uc was filled by getcontext(), it is undefined - getcontext() does not fill // it because the volatile registers are not needed to make setcontext() work. // Hopefully it was zero'd out beforehand. @@ -114,7 +114,19 @@ } intptr_t* os::Linux::ucontext_get_fp(const ucontext_t * uc) { -@@ -257,7 +275,13 @@ +@@ -133,7 +151,11 @@ + } + + static unsigned long ucontext_get_trap(const ucontext_t * uc) { ++#if defined(__GLIBC__) || defined(__UCLIBC__) + return uc->uc_mcontext.regs->trap; ++#else // Musl ++ return uc->uc_mcontext.gp_regs[40]; ++#endif + } + + ExtendedPC os::fetch_frame_from_context(const void* ucVoid, +@@ -259,7 +281,13 @@ // 3.2.1 "Machine State Register"), however note that ISA notation for bit // numbering is MSB 0, so for normal bit numbering (LSB 0) they come to be // bits 33 and 34. It's not related to endianness, just a notation matter. @@ -128,7 +140,7 @@ if (TraceTraps) { tty->print_cr("caught signal in transaction, " "ignoring to jump to abort handler"); -@@ -570,6 +594,7 @@ +@@ -586,6 +614,7 @@ const ucontext_t* uc = (const ucontext_t*)context; st->print_cr("Registers:"); @@ -136,7 +148,7 @@ st->print("pc =" INTPTR_FORMAT " ", uc->uc_mcontext.regs->nip); st->print("lr =" INTPTR_FORMAT " ", uc->uc_mcontext.regs->link); st->print("ctr=" INTPTR_FORMAT " ", uc->uc_mcontext.regs->ctr); -@@ -578,8 +603,18 @@ +@@ -594,8 +623,18 @@ st->print("r%-2d=" INTPTR_FORMAT " ", i, uc->uc_mcontext.regs->gpr[i]); if (i % 3 == 2) st->cr(); } @@ -155,7 +167,7 @@ intptr_t *sp = (intptr_t *)os::Linux::ucontext_get_sp(uc); st->print_cr("Top of Stack: (sp=" PTR_FORMAT ")", p2i(sp)); -@@ -603,12 +638,22 @@ +@@ -618,12 +657,22 @@ st->print_cr("Register to memory mapping:"); st->cr(); |