diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2004-11-27 05:44:12 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2004-11-27 05:44:12 +0000 |
| commit | 0614155d8e87c90923fd938888d78807e91c125e (patch) | |
| tree | efe47b73f8cf5e003a108ea374f712f1184239fa /java/jdk13 | |
| parent | 64ce329014dc18915eed3ab5cb709e0c3b48223e (diff) | |
| download | ports-0614155d8e87c90923fd938888d78807e91c125e.tar.gz ports-0614155d8e87c90923fd938888d78807e91c125e.zip | |
. Fix the HotSpot build for gcc 3.4 part 1/2. Make some methods public
where previously they defaulted to protected. gcc 3.4 seems to pick
this up where earlier versions didn't.
PR: 71516
Submitted by: Damir Kiramov <damirycha@damirycha.net.ru>
Notes
Notes:
svn path=/head/; revision=122561
Diffstat (limited to 'java/jdk13')
| -rw-r--r-- | java/jdk13/files/patch-mutex.hpp | 20 | ||||
| -rw-r--r-- | java/jdk13/files/patch-scavenge.hpp | 24 |
2 files changed, 44 insertions, 0 deletions
diff --git a/java/jdk13/files/patch-mutex.hpp b/java/jdk13/files/patch-mutex.hpp new file mode 100644 index 000000000000..af669fc01221 --- /dev/null +++ b/java/jdk13/files/patch-mutex.hpp @@ -0,0 +1,20 @@ +$FreeBSD$ + +--- ../../hotspot1.3.1/src/share/vm/runtime/mutex.hpp 17 Aug 2001 22:56:19 -0000 1.1.1.2 ++++ ../../hotspot1.3.1/src/share/vm/runtime/mutex.hpp 22 Nov 2004 17:19:42 -0000 +@@ -55,7 +55,6 @@ + debug_only(Thread* _last_owner;) // the last thread to own the lock + #endif + +- void set_owner_implementation(Thread* owner) PRODUCT_RETURN; + void trace (const char* operation) PRODUCT_RETURN; + void check_prelock_state (Thread* thread) PRODUCT_RETURN; + void check_block_state (Thread* thread) PRODUCT_RETURN; +@@ -69,6 +68,7 @@ + _allow_vm_block_flag = true + }; + ++ void set_owner_implementation(Thread* owner) PRODUCT_RETURN; + Mutex(int prio, const char *name, bool allow_vm_block = !_allow_vm_block_flag); + ~Mutex(); + diff --git a/java/jdk13/files/patch-scavenge.hpp b/java/jdk13/files/patch-scavenge.hpp new file mode 100644 index 000000000000..406384ae76e9 --- /dev/null +++ b/java/jdk13/files/patch-scavenge.hpp @@ -0,0 +1,24 @@ +$FreeBSD$ + +--- ../../hotspot1.3.1/src/share/vm/memory/scavenge.hpp 11 Jul 2001 21:33:24 -0000 1.1.1.1 ++++ ../../hotspot1.3.1/src/share/vm/memory/scavenge.hpp 22 Nov 2004 17:19:42 -0000 +@@ -91,6 +91,9 @@ + // fill the new generation large dummy objects + static void fill_newgen(); + ++ // Scavenge entry point called from VM operation ++ static void invoke_at_safepoint(int size_to_be_allocated, bool deferred, bool& notify_ref_lock); ++ + private: + // Scavenge functions and java/lang/ref handling + static void scavenge_oop(oop* p); +@@ -121,9 +124,6 @@ + + static void compute_scavenge_functions(); + +- // Scavenge entry point called from VM operation +- static void invoke_at_safepoint(int size_to_be_allocated, bool deferred, bool& notify_ref_lock); +- + // Cheney scan + static void evacuate_followers(); + |