diff -r 38b4116b6766 -r 35e504cb49a6 src/share/vm/runtime/arguments.cpp --- a/src/share/vm/runtime/arguments.cpp Sat May 05 10:24:55 2012 -0400 +++ b/src/share/vm/runtime/arguments.cpp Fri May 11 11:30:03 2012 -0700 @@ -3039,7 +3039,7 @@ return result; } -#ifdef JAVASE_EMBEDDED +#if (defined JAVASE_EMBEDDED || defined ARM) UNSUPPORTED_OPTION(UseG1GC, "G1 GC"); #endif