comparison src/share/vm/runtime/globals.hpp @ 12356:359f7e70ae7f

Reduce HotSpot diff and fix previous merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 15:41:33 +0200
parents cefad50507d8
children 4dba97fb1a6f
comparison
equal deleted inserted replaced
12355:cefad50507d8 12356:359f7e70ae7f
968 "Print assembly code (using external disassembler.so)") \ 968 "Print assembly code (using external disassembler.so)") \
969 \ 969 \
970 diagnostic(ccstr, PrintAssemblyOptions, NULL, \ 970 diagnostic(ccstr, PrintAssemblyOptions, NULL, \
971 "Options string passed to disassembler.so") \ 971 "Options string passed to disassembler.so") \
972 \ 972 \
973 product(bool, PrintNMethodStatistics, false, \
974 "Print a summary statistic for the generated nmethods") \
975 \
973 diagnostic(bool, PrintNMethods, false, \ 976 diagnostic(bool, PrintNMethods, false, \
974 "Print assembly code for nmethods when generated") \ 977 "Print assembly code for nmethods when generated") \
975 \ 978 \
976 diagnostic(bool, PrintNativeNMethods, false, \ 979 diagnostic(bool, PrintNativeNMethods, false, \
977 "Print assembly code for native nmethods when generated") \ 980 "Print assembly code for native nmethods when generated") \