mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-10-21 20:32:15 +02:00
166ad0377b
ref #4515 openjdk8 and openjdk7 cannot coexist currently due to automatic so dependencies. both packages should be fixed to not provide conflicting so deps (or maybe needs abuild change?)
56 lines
1.7 KiB
Diff
56 lines
1.7 KiB
Diff
--- 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:
|