Merged with michi branch at rev 1684fe51cf3d.

diff --cc src/native/jni.cpp
Simple merge

diff --cc src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.cpp
Simple merge

diff --cc src/native/vm/cldc1.1/com_sun_cldc_io_j2me_socket_Protocol.cpp
Simple merge

diff --cc src/native/vm/gnuclasspath/java_lang_VMClassLoader.cpp
Simple merge

diff --cc src/native/vm/sun_misc_Unsafe.cpp
Simple merge

diff --cc src/vm/class.cpp
Simple merge

diff --cc src/vm/jit/builtin.cpp
Simple merge

diff --cc src/vm/vm.cpp
index 8cbc0ed5cfb59e63e9f2c6fe8b7bffaa8a76e8d7,497d75490a2d2f61cf2bba6d2c900b78d2006c17..23518fd85435b4100e6971781c716dd0c7f632b0
--- 1/src/vm/vm.cpp
--- 2/src/vm/vm.cpp
+++ b/src/vm/vm.cpp
@@@ -1577,24 -1617,11 +1577,11 @@@ void VM::print_run_time_config(
  
  void vm_run(JavaVM *vm, JavaVMInitArgs *vm_args)
  {
-       char*                      option;
-       char*                      mainname;
-       char*                      p;
-       utf                       *mainutf;
-       classinfo                 *mainclass;
-       java_handle_t             *e;
-       methodinfo                *m;
-       java_handle_objectarray_t *oa; 
-       s4                         oalength;
-       utf                       *u;
-       java_handle_t             *s;
-       int                        status;
- 
-       // Prevent compiler warnings.
-       oa = NULL;
+       methodinfo* m;
+       int         status;
  
  #if !defined(NDEBUG)
 -      if (compileall) {
 +      if (opt_CompileAll) {
                vm_compile_all();
                return;
        }