Index: vm/vmcore/src/exception/exceptions_jit.cpp =================================================================== --- vm/vmcore/src/exception/exceptions_jit.cpp (revision 514827) +++ vm/vmcore/src/exception/exceptions_jit.cpp (working copy) @@ -615,7 +615,7 @@ } const unsigned cap_off = (unsigned)(POINTER_SIZE_INT)&((ObjectHandlesNew*)0)->capacity; - const unsigned next_off = (unsigned)(POINTER_SIZE_INT)&((ObjectHandlesNew*)0)->next; + const POINTER_SIZE_INT next_off = (POINTER_SIZE_INT)&((ObjectHandlesNew*)0)->next; const unsigned handles_size = (unsigned)(sizeof(ObjectHandlesNew)+sizeof(ManagedObject*)*16); const unsigned cap_and_size = (unsigned)((0<<16) | 16); @@ -654,7 +654,7 @@ } const unsigned cap_off = (unsigned)(POINTER_SIZE_INT)&((ObjectHandlesNew*)0)->capacity; - const unsigned next_off = (unsigned)(POINTER_SIZE_INT)&((ObjectHandlesNew*)0)->next; + const POINTER_SIZE_INT next_off = (POINTER_SIZE_INT)&((ObjectHandlesNew*)0)->next; const unsigned handles_size = (unsigned)(sizeof(ObjectHandlesNew)+sizeof(ManagedObject*)*16); const unsigned cap_and_size = (unsigned)((0<<16) | 16); Index: vm/vmcore/src/util/em64t/base/compile_em64t.cpp =================================================================== --- vm/vmcore/src/util/em64t/base/compile_em64t.cpp (revision 514827) +++ vm/vmcore/src/util/em64t/base/compile_em64t.cpp (working copy) @@ -74,7 +74,11 @@ Method_Signature_Handle msh = method_get_signature(method); unsigned num_gp_used = 0; +#ifdef _WIN64 +#define num_fp_used num_gp_used +#else // _WIN64 unsigned num_fp_used = 0; +#endif // _WIN64 for(unsigned i = 0; i < method_args_get_number(msh); i++) { Type_Info_Handle tih = method_args_get_type_info(msh, i); switch (type_info_get_type(tih)) {