From e88c42f201b1d8f01528201ee8e436d01fc5145a Mon Sep 17 00:00:00 2001
From: glewis <glewis@FreeBSD.org>
Date: Wed, 22 Jun 2005 15:52:02 +0000
Subject: . Avoid memory corruption on FreeBSD 4.x.  This seems to have no
 affect   under 5.x which was running fine without it.

Approved by:	phantom
---
 java/jdk15/files/patch-hotspot-vm-os_bsd.inline.hpp | 18 ++++++++++++++++++
 java/jdk16/files/patch-hotspot-vm-os_bsd.inline.hpp | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 java/jdk15/files/patch-hotspot-vm-os_bsd.inline.hpp
 create mode 100644 java/jdk16/files/patch-hotspot-vm-os_bsd.inline.hpp

(limited to 'java')

diff --git a/java/jdk15/files/patch-hotspot-vm-os_bsd.inline.hpp b/java/jdk15/files/patch-hotspot-vm-os_bsd.inline.hpp
new file mode 100644
index 000000000000..df60ff6dad62
--- /dev/null
+++ b/java/jdk15/files/patch-hotspot-vm-os_bsd.inline.hpp
@@ -0,0 +1,18 @@
+$FreeBSD$
+
+--- ../../hotspot/src/os/bsd/vm/os_bsd.inline.hpp	20 Dec 2004 10:06:24 -0000	1.2
++++ ../../hotspot/src/os/bsd/vm/os_bsd.inline.hpp	14 May 2005 14:58:18 -0000	1.3
+@@ -29,10 +29,9 @@
+ 
+ inline bool os::allocate_stack_guard_pages() {
+   assert(uses_stack_guard_pages(), "sanity check");
+-// XXXBSD: ??
+-//  return thr_main();
+-//  return pthread_main_np();
+-  return true;
++  // Since FreeBSD 4 uses malloc() for allocating the thread stack             
++  // there is no need to do anything extra to allocate the guard pages
++  return false;
+ }
+ 
+ 
diff --git a/java/jdk16/files/patch-hotspot-vm-os_bsd.inline.hpp b/java/jdk16/files/patch-hotspot-vm-os_bsd.inline.hpp
new file mode 100644
index 000000000000..df60ff6dad62
--- /dev/null
+++ b/java/jdk16/files/patch-hotspot-vm-os_bsd.inline.hpp
@@ -0,0 +1,18 @@
+$FreeBSD$
+
+--- ../../hotspot/src/os/bsd/vm/os_bsd.inline.hpp	20 Dec 2004 10:06:24 -0000	1.2
++++ ../../hotspot/src/os/bsd/vm/os_bsd.inline.hpp	14 May 2005 14:58:18 -0000	1.3
+@@ -29,10 +29,9 @@
+ 
+ inline bool os::allocate_stack_guard_pages() {
+   assert(uses_stack_guard_pages(), "sanity check");
+-// XXXBSD: ??
+-//  return thr_main();
+-//  return pthread_main_np();
+-  return true;
++  // Since FreeBSD 4 uses malloc() for allocating the thread stack             
++  // there is no need to do anything extra to allocate the guard pages
++  return false;
+ }
+ 
+ 
-- 
cgit