Mercurial > hg > truffle
comparison src/share/vm/runtime/arguments.cpp @ 3935:5257f8e66b40
Merge
author | iveresov |
---|---|
date | Fri, 09 Sep 2011 12:44:37 -0700 |
parents | 3cd0157e1d4d 5432047c7db7 |
children | f08d439fab8c |
comparison
equal
deleted
inserted
replaced
3922:e984655be425 | 3935:5257f8e66b40 |
---|---|
3019 if (result != JNI_OK) { | 3019 if (result != JNI_OK) { |
3020 return result; | 3020 return result; |
3021 } | 3021 } |
3022 | 3022 |
3023 #ifdef JAVASE_EMBEDDED | 3023 #ifdef JAVASE_EMBEDDED |
3024 #ifdef PPC | |
3025 UNSUPPORTED_OPTION(EnableInvokeDynamic, "Invoke dynamic"); | |
3026 #endif | |
3027 UNSUPPORTED_OPTION(UseG1GC, "G1 GC"); | 3024 UNSUPPORTED_OPTION(UseG1GC, "G1 GC"); |
3028 #endif | 3025 #endif |
3029 | 3026 |
3030 #ifndef PRODUCT | 3027 #ifndef PRODUCT |
3031 if (TraceBytecodesAt != 0) { | 3028 if (TraceBytecodesAt != 0) { |