forked from andrius/gentoo-bootstrap
60 lines
2.7 KiB
Diff
60 lines
2.7 KiB
Diff
diff -Naur openjdk-7.271_p01/hotspot/src/os/linux/vm/jvm_linux.cpp openjdk-7.271_p01-copy/hotspot/src/os/linux/vm/jvm_linux.cpp
|
|
--- openjdk-7.271_p01/hotspot/src/os/linux/vm/jvm_linux.cpp 2020-10-15 21:59:37.903954981 -0400
|
|
+++ openjdk-7.271_p01-copy/hotspot/src/os/linux/vm/jvm_linux.cpp 2020-10-15 22:15:53.711949921 -0400
|
|
@@ -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). */
|
|
diff -Naur openjdk-7.271_p01/hotspot/src/os/linux/vm/os_linux.inline.hpp openjdk-7.271_p01-copy/hotspot/src/os/linux/vm/os_linux.inline.hpp
|
|
--- openjdk-7.271_p01/hotspot/src/os/linux/vm/os_linux.inline.hpp 2020-10-15 21:59:37.911954981 -0400
|
|
+++ openjdk-7.271_p01-copy/hotspot/src/os/linux/vm/os_linux.inline.hpp 2020-10-15 22:16:17.291949799 -0400
|
|
@@ -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) {
|
|
diff -Naur openjdk-7.271_p01/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk-7.271_p01-copy/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
|
|
--- openjdk-7.271_p01/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2020-10-15 21:59:37.919954981 -0400
|
|
+++ openjdk-7.271_p01-copy/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2020-10-15 22:17:32.267949410 -0400
|
|
@@ -73,7 +73,6 @@
|
|
# include <pwd.h>
|
|
# include <poll.h>
|
|
# include <ucontext.h>
|
|
-# include <fpu_control.h>
|
|
|
|
#ifdef AMD64
|
|
#define REG_SP REG_RSP
|
|
@@ -534,6 +533,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
|
|
// set fpu to 53 bit precision
|
|
diff -Naur openjdk-7.271_p01/hotspot/src/os_cpu/linux_x86/vm/threadLS_linux_x86.hpp openjdk-7.271_p01-copy/hotspot/src/os_cpu/linux_x86/vm/threadLS_linux_x86.hpp
|
|
--- openjdk-7.271_p01/hotspot/src/os_cpu/linux_x86/vm/threadLS_linux_x86.hpp 2020-10-15 21:59:37.919954981 -0400
|
|
+++ openjdk-7.271_p01-copy/hotspot/src/os_cpu/linux_x86/vm/threadLS_linux_x86.hpp 2020-10-15 22:18:17.359949177 -0400
|
|
@@ -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:
|