diff options
| author |   Aric Belsito <lluixhi@gmail.com> | 2018-06-10 22:03:54 -0700 |
|---|---|---|
| committer | Aric Belsito <lluixhi@gmail.com> | 2018-06-10 22:03:54 -0700 |
| commit | baaf9c81e54cd3c66aa866e1623cb7ae7c95cdb8 (patch) | |
| tree | 65af6a56b4142ec23d4280f96dfd22a20409e62f | |
| parent | dev-libs/glib: version bump to 2.54.3-r6 (diff) | |
| download | musl-baaf9c81e54cd3c66aa866e1623cb7ae7c95cdb8.tar.gz musl-baaf9c81e54cd3c66aa866e1623cb7ae7c95cdb8.tar.bz2 musl-baaf9c81e54cd3c66aa866e1623cb7ae7c95cdb8.zip | |
dev-java/icedtea: refresh patch
| -rw-r--r-- | dev-java/icedtea/files/icedtea8-hotspot-musl.patch (renamed from dev-java/icedtea/files/icedtea-hotspot-musl.patch) | 50 | ||||
| -rw-r--r-- | dev-java/icedtea/icedtea-3.8.0.ebuild | 4 |
2 files changed, 29 insertions, 25 deletions
diff --git a/dev-java/icedtea/files/icedtea-hotspot-musl.patch b/dev-java/icedtea/files/icedtea8-hotspot-musl.patch index 02f8b8e5..b0cfa3e5 100644 --- a/dev-java/icedtea/files/icedtea-hotspot-musl.patch +++ b/dev-java/icedtea/files/icedtea8-hotspot-musl.patch @@ -1,5 +1,6 @@ ---- openjdk.orig/hotspot/src/os/linux/vm/jvm_linux.cpp -+++ openjdk/hotspot/src/os/linux/vm/jvm_linux.cpp +diff -Naur openjdk.orig/hotspot/src/os/linux/vm/jvm_linux.cpp openjdk/hotspot/src/os/linux/vm/jvm_linux.cpp +--- openjdk.orig/hotspot/src/os/linux/vm/jvm_linux.cpp 2018-06-10 21:57:47.854907734 -0700 ++++ openjdk/hotspot/src/os/linux/vm/jvm_linux.cpp 2018-06-10 21:58:39.423906811 -0700 @@ -154,7 +154,9 @@ #ifdef SIGSTKFLT "STKFLT", SIGSTKFLT, /* Stack fault. */ @@ -10,28 +11,42 @@ "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 @@ +diff -Naur 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 +--- openjdk.orig/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp 2018-06-10 21:57:47.861907734 -0700 ++++ openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp 2018-06-10 22:02:01.895903185 -0700 +@@ -75,7 +75,7 @@ # include <pwd.h> # include <poll.h> # include <ucontext.h> -# include <fpu_control.h> ++# include <linux/types.h> /* provides __u64 */ - #ifdef AMD64 + #ifdef BUILTIN_SIM #define REG_SP REG_RSP -@@ -532,6 +531,9 @@ +diff -Naur 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 +--- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2018-06-10 21:57:47.862907734 -0700 ++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2018-06-10 22:00:00.892905352 -0700 +@@ -72,7 +72,6 @@ + # include <pwd.h> + # include <poll.h> + # include <ucontext.h> +-# include <fpu_control.h> - ShouldNotReachHere(); + #ifdef AMD64 + #define REG_SP REG_RSP +@@ -544,6 +543,9 @@ + return true; // Mute compiler } -+ + +#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 + // set fpu to 53 bit precision +diff -Naur 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 +--- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/threadLS_linux_x86.hpp 2018-06-10 21:57:47.862907734 -0700 ++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/threadLS_linux_x86.hpp 2018-06-10 22:01:01.766904262 -0700 @@ -32,7 +32,9 @@ // map stack pointer to thread pointer - see notes in threadLS_linux_x86.cpp #define SP_BITLENGTH 32 @@ -42,14 +57,3 @@ 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 diff --git a/dev-java/icedtea/icedtea-3.8.0.ebuild b/dev-java/icedtea/icedtea-3.8.0.ebuild index 066a759e..d8da5482 100644 --- a/dev-java/icedtea/icedtea-3.8.0.ebuild +++ b/dev-java/icedtea/icedtea-3.8.0.ebuild @@ -208,7 +208,7 @@ src_unpack() { src_configure() { # Link MUSL patches into icedtea build tree - ln -s "${FILESDIR}/${PN}-hotspot-musl.patch" patches || die + ln -s "${FILESDIR}/${PN}8-hotspot-musl.patch" patches || die ln -s "${FILESDIR}/${PN}8-hotspot-noagent-musl.patch" patches || die ln -s "${FILESDIR}/${PN}8-hotspot-uclibc-fixes.patch" patches || die ln -s "${FILESDIR}/${PN}8-jdk-execinfo.patch" patches || die @@ -230,7 +230,7 @@ src_configure() { # Export MUSL patches for configure DISTRIBUTION_PATCHES="" - DISTRIBUTION_PATCHES+="patches/${PN}-hotspot-musl.patch " + DISTRIBUTION_PATCHES+="patches/${PN}8-hotspot-musl.patch " DISTRIBUTION_PATCHES+="patches/${PN}8-hotspot-noagent-musl.patch " DISTRIBUTION_PATCHES+="patches/${PN}8-hotspot-uclibc-fixes.patch " DISTRIBUTION_PATCHES+="patches/${PN}8-jdk-execinfo.patch " |