From 38e03fb03a8cfdf6696c695dc868bb5486dafe57 Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Wed, 8 Oct 2003 00:42:23 +0000 Subject: . Make HotSpot compile with gcc 3.3.1. Submitted by: Munehiro Matsuda Reminded by: mi --- java/jdk13/files/patch-javaCalls.cpp | 41 ++++++++++++ java/jdk13/files/patch-jni.cpp | 84 ++++++++++++++++++++++++ java/jdk13/files/patch-jvmdiInterfaceSupport.hpp | 13 ++++ java/jdk13/files/patch-mutexLocker.cpp | 13 ++++ 4 files changed, 151 insertions(+) create mode 100644 java/jdk13/files/patch-javaCalls.cpp create mode 100644 java/jdk13/files/patch-jni.cpp create mode 100644 java/jdk13/files/patch-jvmdiInterfaceSupport.hpp create mode 100644 java/jdk13/files/patch-mutexLocker.cpp (limited to 'java/jdk13') diff --git a/java/jdk13/files/patch-javaCalls.cpp b/java/jdk13/files/patch-javaCalls.cpp new file mode 100644 index 000000000000..9c569bb54aa5 --- /dev/null +++ b/java/jdk13/files/patch-javaCalls.cpp @@ -0,0 +1,41 @@ +$FreeBSD$ + +--- ../../hotspot1.3.1/src/share/vm/runtime/javaCalls.cpp 5 Jun 2002 05:27:48 -0000 1.2 ++++ ../../hotspot1.3.1/src/share/vm/runtime/javaCalls.cpp 27 Jul 2003 10:43:28 -0000 1.3 +@@ -344,36 +344,6 @@ + { JavaCallWrapper link(method, receiver, result, CHECK); + { HandleMark hm(thread); + +-#if 0 +-fprintf(stderr, " +-StubRoutines::call_stub: +- link = 0x%08x, +- result_val_address = 0x%08x, +- result_type = 0x%08x, +- entry_point = 0x%08x, +- method = 0x%08x,", +-// args->parameters() = 0x%08x, +-// args->size_of_parameters() = 0x%08x\n", +- (address)&link, +- result_val_address, +- result_type, +- entry_point, +- method() +-// args->parameters(), +-// args->size_of_parameters() +- ); +- +-#if 0 +-fprintf(stderr, " +- address = %d, +- BasicType = %d, +- jint* = %d\n", +- sizeof(address), +- sizeof(BasicType), +- sizeof(jint*) +- ); +-#endif +-#endif + + StubRoutines::call_stub()( + (address)&link, diff --git a/java/jdk13/files/patch-jni.cpp b/java/jdk13/files/patch-jni.cpp new file mode 100644 index 000000000000..28aeb3f9324d --- /dev/null +++ b/java/jdk13/files/patch-jni.cpp @@ -0,0 +1,84 @@ +$FreeBSD$ +--- ../../hotspot1.3.1/src/share/vm/prims/jni.cpp 17 Aug 2001 22:56:37 -0000 1.1.1.2 ++++ ../../hotspot1.3.1/src/share/vm/prims/jni.cpp 27 Jul 2003 10:42:46 -0000 1.2 +@@ -743,7 +743,7 @@ + JNI_ArgumentPusherVaArg ap(methodID, args); \ + jni_invoke(env, &jvalue, obj, JNI_VIRTUAL, methodID, &ap, CHECK_0); \ + va_end(args); \ +- return (ResultType)(jvalue._value.##unionType); \ ++ return (ResultType)(jvalue._value.unionType); \ + JNI_END \ + \ + \ +@@ -753,7 +753,7 @@ + JavaValue jvalue(Tag); \ + JNI_ArgumentPusherVaArg ap(methodID, args); \ + jni_invoke(env, &jvalue, obj, JNI_VIRTUAL, methodID, &ap, CHECK_0); \ +- return (ResultType)(jvalue._value.##unionType); \ ++ return (ResultType)(jvalue._value.unionType); \ + JNI_END \ + \ + \ +@@ -763,7 +763,7 @@ + JavaValue jvalue(Tag); \ + JNI_ArgumentPusherArray ap(methodID, args); \ + jni_invoke(env, &jvalue, obj, JNI_VIRTUAL, methodID, &ap, CHECK_0); \ +- return (ResultType)(jvalue._value.##unionType); \ ++ return (ResultType)(jvalue._value.unionType); \ + JNI_END + + // the runtime type of subword integral basic types is integer +@@ -818,7 +818,7 @@ + JNI_ArgumentPusherVaArg ap(methodID, args); \ + jni_invoke(env, &jvalue, obj, JNI_NONVIRTUAL, methodID, &ap, CHECK_0); \ + va_end(args); \ +- return (ResultType)(jvalue._value.##unionType); \ ++ return (ResultType)(jvalue._value.unionType); \ + JNI_END \ + \ + \ +@@ -828,7 +828,7 @@ + JavaValue jvalue(Tag); \ + JNI_ArgumentPusherVaArg ap(methodID, args); \ + jni_invoke(env, &jvalue, obj, JNI_NONVIRTUAL, methodID, &ap, CHECK_0); \ +- return (ResultType)(jvalue._value.##unionType); \ ++ return (ResultType)(jvalue._value.unionType); \ + JNI_END \ + \ + \ +@@ -838,7 +838,7 @@ + JavaValue jvalue(Tag); \ + JNI_ArgumentPusherArray ap(methodID, args); \ + jni_invoke(env, &jvalue, obj, JNI_NONVIRTUAL, methodID, &ap, CHECK_0); \ +- return (ResultType)(jvalue._value.##unionType); \ ++ return (ResultType)(jvalue._value.unionType); \ + JNI_END + + // the runtime type of subword integral basic types is integer +@@ -893,7 +893,7 @@ + JNI_ArgumentPusherVaArg ap(methodID, args); \ + jni_invoke(env, &jvalue, NULL, JNI_STATIC, methodID, &ap, CHECK_0); \ + va_end(args); \ +- return (ResultType)(jvalue._value.##unionType); \ ++ return (ResultType)(jvalue._value.unionType); \ + JNI_END \ + \ + \ +@@ -903,7 +903,7 @@ + JavaValue jvalue(Tag); \ + JNI_ArgumentPusherVaArg ap(methodID, args); \ + jni_invoke(env, &jvalue, NULL, JNI_STATIC, methodID, &ap, CHECK_0); \ +- return (ResultType)(jvalue._value.##unionType); \ ++ return (ResultType)(jvalue._value.unionType); \ + JNI_END \ + \ + \ +@@ -913,7 +913,7 @@ + JavaValue jvalue(Tag); \ + JNI_ArgumentPusherArray ap(methodID, args); \ + jni_invoke(env, &jvalue, NULL, JNI_STATIC, methodID, &ap, CHECK_0); \ +- return (ResultType)(jvalue._value.##unionType); \ ++ return (ResultType)(jvalue._value.unionType); \ + JNI_END + + // the runtime type of subword integral basic types is integer diff --git a/java/jdk13/files/patch-jvmdiInterfaceSupport.hpp b/java/jdk13/files/patch-jvmdiInterfaceSupport.hpp new file mode 100644 index 000000000000..17385502eeef --- /dev/null +++ b/java/jdk13/files/patch-jvmdiInterfaceSupport.hpp @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../hotspot1.3.1/src/share/vm/runtime/jvmdiInterfaceSupport.hpp 11 Jul 2001 21:32:58 -0000 1.1 ++++ ../../hotspot1.3.1/src/share/vm/runtime/jvmdiInterfaceSupport.hpp 27 Jul 2003 10:42:07 -0000 1.2 +@@ -30,7 +30,7 @@ + result_type JNICALL methodName signature { \ + JavaThread* thread = (JavaThread*) ThreadLocalStorage::thread(); \ + TransitionClass __tiv(thread); \ +- __ENTRY(result_type, methodName##signature, thread) \ ++ __ENTRY(result_type, methodName signature, thread) \ + debug_only(VMNativeEntryWrapper __vew;) \ + debug_only(const char* const _jvmdi_methodName_ = #methodName;) \ + debug_only(bool _trace_ = trace; ); \ diff --git a/java/jdk13/files/patch-mutexLocker.cpp b/java/jdk13/files/patch-mutexLocker.cpp new file mode 100644 index 000000000000..25bea3f45b19 --- /dev/null +++ b/java/jdk13/files/patch-mutexLocker.cpp @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../hotspot1.3.1/src/share/vm/runtime/mutexLocker.cpp 17 Aug 2001 22:56:20 -0000 1.1.1.2 ++++ ../../hotspot1.3.1/src/share/vm/runtime/mutexLocker.cpp 27 Jul 2003 10:41:16 -0000 1.2 +@@ -90,7 +90,7 @@ + #endif + + #define def(var, type, pri, vm_block) \ +- var = new type(Mutex::##pri, #var, vm_block) ++ var = new type(Mutex::pri, #var, vm_block) + + void mutex_init() { + def(Patching_lock , Mutex , leaf, true ); -- cgit v1.2.3