summaryrefslogtreecommitdiff
path: root/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2019-04-19 16:31:33 +0000
committerGreg Lewis <glewis@FreeBSD.org>2019-04-19 16:31:33 +0000
commiteee68625ae6d1cc00e4ed31f5ffd2e3dfba2cc9b (patch)
treead7cd58e88b6dc5102193a7f120363558831d2a2 /java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp
parentdevel/hpx: fix build with GCC-based architectures (diff)
* Update to 8u212.
* Change master site to Github * Remove patches and Makefile fixes that have been upstreamed to Github
Diffstat (limited to 'java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp')
-rw-r--r--java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp36
1 files changed, 0 insertions, 36 deletions
diff --git a/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp b/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp
deleted file mode 100644
index 09594d524ca7..000000000000
--- a/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
---- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2017-09-06 22:12:44 UTC
-+++ hotspot/src/os/bsd/vm/os_bsd.cpp
-@@ -189,7 +189,9 @@ julong os::Bsd::available_memory() {
- #ifdef __FreeBSD__
- static const char *vm_stats[] = {
- "vm.stats.vm.v_free_count",
-+#if __FreeBSD_version < 1200016
- "vm.stats.vm.v_cache_count",
-+#endif
- "vm.stats.vm.v_inactive_count"
- };
- size_t size;
-@@ -775,6 +777,11 @@ static void *java_start(Thread *thread)
- guarantee(unique_thread_id != 0, "unique thread id was not found");
- osthread->set_unique_thread_id(unique_thread_id);
- #endif
-+#ifdef __FreeBSD__
-+ uint64_t unique_thread_id = os::Bsd::gettid();
-+ guarantee(unique_thread_id != 0, "unique thread id was not found");
-+ osthread->set_unique_thread_id(unique_thread_id);
-+#endif
- // initialize signal mask for this thread
- os::Bsd::hotspot_sigmask(thread);
-
-@@ -938,6 +945,11 @@ bool os::create_attached_thread(JavaThre
- guarantee(unique_thread_id != 0, "just checking");
- osthread->set_unique_thread_id(unique_thread_id);
- #endif
-+#ifdef __FreeBSD__
-+ uint64_t unique_thread_id = os::Bsd::gettid();
-+ guarantee(unique_thread_id != 0, "unique thread id was not found");
-+ osthread->set_unique_thread_id(unique_thread_id);
-+#endif
- osthread->set_pthread_id(::pthread_self());
-
- // initialize floating point control register