aboutsummaryrefslogtreecommitdiffstats
path: root/main/openjdk7/icedtea-hotspot-musl.patch
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2014-02-20 07:49:11 +0000
committerTimo Teräs <timo.teras@iki.fi>2014-02-20 07:50:29 +0000
commitacdecf0f389384a5622583946f65d16e6ed45cec (patch)
tree0f3b86b374d988169c59dc5a096642eae8b534ef /main/openjdk7/icedtea-hotspot-musl.patch
parente86997cbcc2090b05cb4f07067e3789236b1ffb2 (diff)
downloadaports-acdecf0f389384a5622583946f65d16e6ed45cec.tar.gz
aports-acdecf0f389384a5622583946f65d16e6ed45cec.tar.bz2
aports-acdecf0f389384a5622583946f65d16e6ed45cec.tar.xz
main/openjdk7: new aport
Diffstat (limited to 'main/openjdk7/icedtea-hotspot-musl.patch')
-rw-r--r--main/openjdk7/icedtea-hotspot-musl.patch55
1 files changed, 55 insertions, 0 deletions
diff --git a/main/openjdk7/icedtea-hotspot-musl.patch b/main/openjdk7/icedtea-hotspot-musl.patch
new file mode 100644
index 0000000000..41072defe2
--- /dev/null
+++ b/main/openjdk7/icedtea-hotspot-musl.patch
@@ -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/linux/vm/os_linux.inline.hpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.inline.hpp
+@@ -52,7 +52,7 @@
+
+ #include <unistd.h>
+ #include <sys/socket.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <netdb.h>
+
+ inline void* os::thread_local_storage_at(int index) {
+--- 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: