diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-02-26 23:08:27 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-02-26 23:08:27 +0000 |
| commit | e3a4ee5e107db0e37a99e7b50d976b0e938f5392 (patch) | |
| tree | c96d33f0fb63ab0c2df3b2d8c6982950691ed17f /experimental/openjdk7/icedtea-hotspot-musl.patch | |
| parent | 5ba732fc812b6ccc5a40d43a1a4fd9c769bc73e0 (diff) | |
| download | packages-e3a4ee5e107db0e37a99e7b50d976b0e938f5392.tar.gz packages-e3a4ee5e107db0e37a99e7b50d976b0e938f5392.tar.bz2 packages-e3a4ee5e107db0e37a99e7b50d976b0e938f5392.tar.xz packages-e3a4ee5e107db0e37a99e7b50d976b0e938f5392.zip | |
experimental/openjdk7: new package (requires gawk)
Diffstat (limited to 'experimental/openjdk7/icedtea-hotspot-musl.patch')
| -rw-r--r-- | experimental/openjdk7/icedtea-hotspot-musl.patch | 79 |
1 files changed, 79 insertions, 0 deletions
diff --git a/experimental/openjdk7/icedtea-hotspot-musl.patch b/experimental/openjdk7/icedtea-hotspot-musl.patch new file mode 100644 index 000000000..1da903148 --- /dev/null +++ b/experimental/openjdk7/icedtea-hotspot-musl.patch @@ -0,0 +1,79 @@ +--- 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 +@@ -533,6 +532,9 @@ + ShouldNotReachHere(); + 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 +@@ -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: +--- openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp.orig ++++ openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp +@@ -76,7 +76,7 @@ + # include <pwd.h> + # include <poll.h> + # include <ucontext.h> +-# include <fpu_control.h> ++# include <linux/types.h> + + #ifdef BUILTIN_SIM + #define REG_SP REG_RSP +--- openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp.orig ++++ openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp +@@ -194,10 +194,6 @@ + return (r->reg2stack() + SharedRuntime::out_preserve_stack_slots()) * VMRegImpl::stack_slot_size; + } + +-template <class T> static const T& min (const T& a, const T& b) { +- return (a > b) ? b : a; +-} +- + // --------------------------------------------------------------------------- + // Read the array of BasicTypes from a signature, and compute where the + // arguments should go. Values in the VMRegPair regs array refer to 4-byte |