Date: Wed, 03 Sep 2003 08:12:11 +0000 From: Jens Rehsack <rehsack@liwing.de> To: Peter Ulrich Kruppa <root@pukruppa.de> Cc: freebsd-ports@freebsd.org Subject: Re: jdk14 build fails on -CURRENT Message-ID: <3F55A25B.1050606@liwing.de> In-Reply-To: <20030903095023.B649@pukruppa.net> References: <20030903095023.B649@pukruppa.net>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------000702000501090101010400 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Peter Ulrich Kruppa wrote: > Hi, > > I tried to install the jdk14 port on my > pukruppa.net 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Wed Sep 3 > 00:27:22 CEST 2003 > machine. > The build died with: > > --------------------------------------------------- > > /usr/ports/java/jdk14/work/hotspot/src/share/vm/prims/jni.cpp:1085:56: > pasting "." and "l" does not give a valid preprocessing token > /usr/ports/java/jdk14/work/hotspot/src/share/vm/prims/jni.cpp:1085:56: > pasting "." and "l" does not give a valid preprocessing token > /usr/ports/java/jdk14/work/hotspot/src/share/vm/prims/jni.cpp:1086:56: > pasting "." and "f" does not give a valid preprocessing token > /usr/ports/java/jdk14/work/hotspot/src/share/vm/prims/jni.cpp:1086:56: > pasting "." and "f" does not give a valid preprocessing token > /usr/ports/java/jdk14/work/hotspot/src/share/vm/prims/jni.cpp:1086:56: > pasting "." and "f" does not give a valid preprocessing token > /usr/ports/java/jdk14/work/hotspot/src/share/vm/prims/jni.cpp:1087:56: > pasting "." and "d" does not give a valid preprocessing token > /usr/ports/java/jdk14/work/hotspot/src/share/vm/prims/jni.cpp:1087:56: > pasting "." and "d" does not give a valid preprocessing token > /usr/ports/java/jdk14/work/hotspot/src/share/vm/prims/jni.cpp:1087:56: > pasting "." and "d" does not give a valid preprocessing token > /usr/ports/java/jdk14/work/hotspot/src/share/vm/prims/jni.cpp:1213:50: > pasting "." and "z" does not give a valid preprocessing token > /usr/ports/java/jdk14/work/hotspot/src/share/vm/prims/jni.cpp:1214:50: > pasting "." and "b" does not give a valid preprocessing token > /usr/ports/java/jdk14/work/hotspot/src/share/vm/prims/jni.cpp:1215:50: > pasting "." and "c" does not give a valid preprocessing token > /usr/ports/java/jdk14/work/hotspot/src/share/vm/prims/jni.cpp:1216:50: > pasting " > ." and "s" does not give a valid preprocessing token > /usr/ports/java/jdk14/work/hotspot/src/share/vm/prims/jni.cpp:1346:56: > pasting "." and "i" does not give a valid preprocessing token > /usr/ports/java/jdk14/work/hotspot/src/share/vm/prims/jni.cpp:1347:56: > pasting "." and "j" does not give a valid preprocessing token > /usr/ports/java/jdk14/work/hotspot/src/share/vm/prims/jni.cpp:1348:56: > pasting "." and "f" does not give a valid preprocessing token > /usr/ports/java/jdk14/work/hotspot/src/share/vm/prims/jni.cpp:1349:56: > pasting "." and "d" does not give a valid preprocessing token > gmake[3]: *** [jni.o] Error 1 > gmake[3]: Leaving directory > `/usr/ports/java/jdk14/work/control/build/bsd-i586/hotspot-i586/tmp/bsd_i486_compiler2/product' > gmake[2]: *** [the_vm] Error 2 > gmake[2]: Leaving directory > `/usr/ports/java/jdk14/work/control/build/bsd-i586/hotspot-i586/tmp/bsd_i486_compiler2/product' > gmake[1]: *** [product] Error 2 > gmake[1]: Leaving directory > `/usr/ports/java/jdk14/work/control/build/bsd-i586/hotspot-i586/tmp' > gmake: *** [product] Error 2 > *** Error code 2 > > Stop in /usr/ports/java/jdk14. According to <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=9513>, <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=9688>; and <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=9689>; attached patches migth help you. Furthermore, similar ones are included in -current patchset for jdk14, downloadable from <http://www.eyesbeyond.com/freebsddom/java/jdk14.html>. Jens --------------000702000501090101010400 Content-Type: text/plain; name="work::hotspot::src::share::vm::prims::jni.cpp" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="work::hotspot::src::share::vm::prims::jni.cpp" --- work/hotspot/src/share/vm/prims/jni.cpp.orig Mon Sep 1 12:47:11 2003 +++ work/hotspot/src/share/vm/prims/jni.cpp Mon Sep 1 13:13:15 2003 @@ -902,7 +902,7 @@ JNI_ArgumentPusherVaArg ap(methodID, args); \ jni_invoke_nonstatic(env, &jvalue, obj, JNI_VIRTUAL, methodID, &ap, CHECK_0); \ va_end(args); \ - return (ResultType)(jvalue._value.##unionType); \ + return (ResultType)(jvalue._value.unionType); \ JNI_END \ \ \ @@ -912,7 +912,7 @@ JavaValue jvalue(Tag); \ JNI_ArgumentPusherVaArg ap(methodID, args); \ jni_invoke_nonstatic(env, &jvalue, obj, JNI_VIRTUAL, methodID, &ap, CHECK_0); \ - return (ResultType)(jvalue._value.##unionType); \ + return (ResultType)(jvalue._value.unionType); \ JNI_END \ \ \ @@ -922,7 +922,7 @@ JavaValue jvalue(Tag); \ JNI_ArgumentPusherArray ap(methodID, args); \ jni_invoke_nonstatic(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 @@ -976,7 +976,7 @@ JNI_ArgumentPusherVaArg ap(methodID, args); \ jni_invoke_nonstatic(env, &jvalue, obj, JNI_NONVIRTUAL, methodID, &ap, CHECK_0); \ va_end(args); \ - return (ResultType)(jvalue._value.##unionType); \ + return (ResultType)(jvalue._value.unionType); \ JNI_END \ \ \ @@ -986,7 +986,7 @@ JavaValue jvalue(Tag); \ JNI_ArgumentPusherVaArg ap(methodID, args); \ jni_invoke_nonstatic(env, &jvalue, obj, JNI_NONVIRTUAL, methodID, &ap, CHECK_0); \ - return (ResultType)(jvalue._value.##unionType); \ + return (ResultType)(jvalue._value.unionType); \ JNI_END \ \ \ @@ -996,7 +996,7 @@ JavaValue jvalue(Tag); \ JNI_ArgumentPusherArray ap(methodID, args); \ jni_invoke_nonstatic(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 @@ -1051,7 +1051,7 @@ JNI_ArgumentPusherVaArg ap(methodID, args); \ jni_invoke_static(env, &jvalue, NULL, JNI_STATIC, methodID, &ap, CHECK_0); \ va_end(args); \ - return (ResultType)(jvalue._value.##unionType); \ + return (ResultType)(jvalue._value.unionType); \ JNI_END \ \ \ @@ -1061,7 +1061,7 @@ JavaValue jvalue(Tag); \ JNI_ArgumentPusherVaArg ap(methodID, args); \ jni_invoke_static(env, &jvalue, NULL, JNI_STATIC, methodID, &ap, CHECK_0); \ - return (ResultType)(jvalue._value.##unionType); \ + return (ResultType)(jvalue._value.unionType); \ JNI_END \ \ \ @@ -1071,7 +1071,7 @@ JavaValue jvalue(Tag); \ JNI_ArgumentPusherArray ap(methodID, args); \ jni_invoke_static(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 @@ -1204,7 +1204,7 @@ /* and creates a ResetNoHandleMark. */ \ if (jvmdi::enabled()) { \ jvalue field_value; \ - field_value.##unionType = value; \ + field_value.unionType = value; \ o = jvmdi::jni_SetField_probe_nh(thread, obj, o, k, fieldID, false, SigType, (jvalue *)&field_value); \ } \ o->Fieldname##_field_put(offset, value); \ @@ -1333,7 +1333,7 @@ /* jni_SetField_probe() assumes that is okay to create handles. */ \ if (jvmdi::enabled()) { \ jvalue field_value; \ - field_value.##unionType = value; \ + field_value.unionType = value; \ jvmdi::jni_SetField_probe(thread, NULL, NULL, id->holder(), fieldID, true, SigType, (jvalue *)&field_value); \ } \ id->holder()-> Fieldname##_field_put (id->offset(), value); \ --------------000702000501090101010400 Content-Type: text/plain; name="work::hotspot::src::share::vm::runtime::jvmdiInterfaceSupport.hpp" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="work::hotspot::src::share::vm::runtime::jvmdiInterfaceSupport.hpp" --- work/hotspot/src/share/vm/runtime/jvmdiInterfaceSupport.hpp.orig Mon Sep 1 13:31:26 2003 +++ work/hotspot/src/share/vm/runtime/jvmdiInterfaceSupport.hpp Mon Sep 1 13:33:53 2003 @@ -24,7 +24,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; ); \ --------------000702000501090101010400 Content-Type: text/plain; name="work::hotspot::src::share::vm::runtime::mutexLocker.cpp" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="work::hotspot::src::share::vm::runtime::mutexLocker.cpp" --- work/hotspot/src/share/vm/runtime/mutexLocker.cpp.orig Mon Sep 1 13:41:43 2003 +++ work/hotspot/src/share/vm/runtime/mutexLocker.cpp Mon Sep 1 13:41:57 2003 @@ -95,7 +95,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(Event_lock , Mutex , event, true ); // allow to lock in VM --------------000702000501090101010400--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3F55A25B.1050606>