diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-02-19 07:48:39 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-02-19 07:50:34 +0000 |
| commit | 8df009284c4c1f79abd2360b5c373fb391c34706 (patch) | |
| tree | faebca0cc634d1472f721acbe1e63214461e88f0 /main/openjdk6/icedtea-hotspot-musl.patch | |
| parent | 20eae13751573f2ba970f44d16674cbaaf69e101 (diff) | |
| download | aports-8df009284c4c1f79abd2360b5c373fb391c34706.tar.bz2 aports-8df009284c4c1f79abd2360b5c373fb391c34706.tar.xz | |
main/openjdk6: fix musl build
exclude hotspot agent as thread_db is not properly supported
in musl.
Diffstat (limited to 'main/openjdk6/icedtea-hotspot-musl.patch')
| -rw-r--r-- | main/openjdk6/icedtea-hotspot-musl.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/main/openjdk6/icedtea-hotspot-musl.patch b/main/openjdk6/icedtea-hotspot-musl.patch new file mode 100644 index 0000000000..ef61635489 --- /dev/null +++ b/main/openjdk6/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 +@@ -159,7 +159,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 +@@ -44,7 +44,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/threadLS_linux_x86.hpp ++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/threadLS_linux_x86.hpp +@@ -31,7 +31,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)]; + #endif // !AMD64 + +--- 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 +@@ -79,7 +79,6 @@ + # include <pwd.h> + # include <poll.h> + # include <ucontext.h> +-# include <fpu_control.h> + + #ifdef AMD64 + #define REG_SP REG_RSP +@@ -529,6 +528,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 |