1.1 --- a/ChangeLog	Tue Aug 05 08:08:37 2008 +0100
     1.2 +++ b/ChangeLog	Tue Aug 05 08:20:38 2008 +0100
     1.3 @@ -5,6 +5,14 @@
     1.4  ==============
     1.5  2008-08-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
     1.6  
     1.7 +	* src/symbol.h:
     1.8 +	Remove #ifdefs in #define.
     1.9 +	* src/thread.c:
    1.10 +	Add missing semicolon and move system_group
    1.11 +	definition up.
    1.12 +	
    1.13 +2008-08-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
    1.14 +
    1.15  	* src/symbol.h,
    1.16  	* src/thread.c:
    1.17  	Support initialising java.lang.Thread on

     2.1 --- a/src/symbol.h	Tue Aug 05 08:08:37 2008 +0100
     2.2 +++ b/src/symbol.h	Tue Aug 05 08:20:38 2008 +0100
     2.3 @@ -29,11 +29,8 @@
     2.4      action(Z, "Z"), \
     2.5      action(pd, "pd"), \
     2.6      action(put, "put"), \
     2.7 -#ifdef WITH_JAVA_RUNTIME_LIBRARY_CLASSPATH
     2.8      action(cap, "cap"), \
     2.9 -#elif WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
    2.10      action(capacity, "capacity"), \
    2.11 -#endif
    2.12      action(run, "run"), \
    2.13      action(main, "main"), \
    2.14      action(data, "data"), \
    2.15 @@ -63,13 +60,10 @@
    2.16      action(backtrace, "backtrace"), \
    2.17      action(initCause, "initCause"), \
    2.18      action(loadClass, "loadClass"), \
    2.19 -#ifdef WITH_JAVA_RUNTIME_LIBRARY_CLASSPATH
    2.20      action(addThread, "addThread"), \
    2.21      action(removeThread, "removeThread"), \
    2.22 -#elif WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
    2.23      action(add, "add"), \
    2.24      action(remove, "remove"), \
    2.25 -#endif
    2.26      action(declaringClass, "declaringClass"), \
    2.27      action(printStackTrace, "printStackTrace"), \
    2.28      action(exceptionHandler, "exceptionHandler"), \
    2.29 @@ -147,11 +141,8 @@
    2.30      action(java_lang_reflect_Constructor, "java/lang/reflect/Constructor"), \
    2.31      action(java_lang_ref_PhantomReference, "java/lang/ref/PhantomReference"), \
    2.32      action(jamvm_java_lang_VMClassLoaderData, "jamvm/java/lang/VMClassLoaderData"), \
    2.33 -#ifdef WITH_JAVA_RUNTIME_LIBRARY_CLASSPATH
    2.34      action(java_nio_DirectByteBufferImpl_ReadWrite, "java/nio/DirectByteBufferImpl$ReadWrite"), \
    2.35 -#elif WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
    2.36      action(java_nio_DirectByteBuffer, "java/nio/DirectByteBuffer"), \
    2.37 -#endif
    2.38      \
    2.39      /* Exception class names */\
    2.40      action(java_lang_Error, "java/lang/Error"), \
    2.41 @@ -214,16 +205,13 @@
    2.42             "(Ljava/lang/Thread;Ljava/lang/Throwable;)V"), \
    2.43      action(_java_lang_Throwable__java_lang_Throwable, \
    2.44             "(Ljava/lang/Throwable;)Ljava/lang/Throwable;"), \
    2.45 -#ifdef WITH_JAVA_RUNTIME_LIBRARY_CLASSPATH
    2.46      action(_java_lang_VMThread_java_lang_String_I_Z__V, \
    2.47             "(Ljava/lang/VMThread;Ljava/lang/String;IZ)V"), \
    2.48      action(_java_lang_Object_gnu_classpath_Pointer_III__V, \
    2.49             "(Ljava/lang/Object;Lgnu/classpath/Pointer;III)V"), \
    2.50 -#elif WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
    2.51      action(_LI__V, "(LI)V"), \
    2.52      action(_java_lang_ThreadGroup_java_lang_String__V, \
    2.53             "(Ljava/lang/ThreadGroup;Ljava/lang/String;)V"), \
    2.54 -#endif
    2.55      action(_java_lang_String__V, "(Ljava/lang/String;)V"), \
    2.56      action(_array_java_lang_String__V, "([Ljava/lang/String;)V"), \
    2.57      action(_java_lang_Throwable__V, "(Ljava/lang/Throwable;)V"), \
    2.58 @@ -233,13 +221,10 @@
    2.59             "(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;I)V"), \
    2.60      action(_java_lang_Object_java_lang_Object__java_lang_Object, \
    2.61             "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"), \
    2.62 -#ifdef WITH_JAVA_RUNTIME_LIBRARY_CLASSPATH
    2.63      action(_java_lang_String_I_java_lang_String_java_lang_String_Z__V, \
    2.64             "(Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Z)V"), \
    2.65 -#elif WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
    2.66      action(_java_lang_String_java_lang_String_java_lang_String_I__V, \
    2.67             "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V"), \
    2.68 -#endif
    2.69      action(_java_lang_Class_array_java_lang_Class_array_java_lang_Class_I__V, \
    2.70             "(Ljava/lang/Class;[Ljava/lang/Class;[Ljava/lang/Class;I)V"), \
    2.71      action(_java_lang_String__java_lang_Class, "(Ljava/lang/String;)Ljava/lang/Class;"), \

     3.1 --- a/src/thread.c	Tue Aug 05 08:08:37 2008 +0100
     3.2 +++ b/src/thread.c	Tue Aug 05 08:20:38 2008 +0100
     3.3 @@ -1097,12 +1097,12 @@
     3.4      MethodBlock *run, *remove_thread;
     3.5      FieldBlock *group, *priority, *root, *threadId;
     3.6      FieldBlock *vmThread = NULL, *thread = NULL;
     3.7 -    FieldBlock *vmData, *daemon, *name
     3.8 +    FieldBlock *vmData, *daemon, *name;
     3.9        /* VMDIFF: OpenJDK needs to create two thread groups */
    3.10  #ifdef WITH_JAVA_RUNTIME_LIBRARY_CLASSPATH
    3.11      Class *thrdGrp_class;
    3.12  #elif WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
    3.13 -    Object *main_group;
    3.14 +    Object *main_group, *system_group;
    3.15      MethodBlock *tginit_mb, *tginit_mb2;
    3.16  #endif
    3.17  
    3.18 @@ -1149,7 +1149,7 @@
    3.19          }
    3.20  #elif WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
    3.21  	if (thrdGrp_class != NULL) {
    3.22 -	  Object* system_group = allocObject(thrdGrp_class);
    3.23 +	  system_group = allocObject(thrdGrp_class);
    3.24  	  executeMethod(system_group, tginit_mb);
    3.25  	  main_group = allocObject(thrdGrp_class);
    3.26  	  executeMethod(main_group, tginit_mb2, system_group,