comparison src/share/vm/runtime/globals.hpp @ 10409:36bcc10e01c0

merge fixes
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 15:37:32 +0200
parents 836a62f43af9
children 0b1b5356b566
comparison
equal deleted inserted replaced
10408:836a62f43af9 10409:36bcc10e01c0
3707 "Include GC cause in GC logging") \ 3707 "Include GC cause in GC logging") \
3708 \ 3708 \
3709 product(bool , AllowNonVirtualCalls, false, \ 3709 product(bool , AllowNonVirtualCalls, false, \
3710 "Obey the ACC_SUPER flag and allow invokenonvirtual calls") \ 3710 "Obey the ACC_SUPER flag and allow invokenonvirtual calls") \
3711 \ 3711 \
3712 product(bool, TraceWarpLoading, false, \
3713 "Trace external GPU warp loading") \
3714 \
3712 diagnostic(ccstr, SharedArchiveFile, NULL, \ 3715 diagnostic(ccstr, SharedArchiveFile, NULL, \
3713 "Override the default location of the CDS archive file") \ 3716 "Override the default location of the CDS archive file") \
3714 \ 3717 \
3715 experimental(uintx, ArrayAllocatorMallocLimit, \ 3718 experimental(uintx, ArrayAllocatorMallocLimit, \
3716 SOLARIS_ONLY(64*K) NOT_SOLARIS(max_uintx), \ 3719 SOLARIS_ONLY(64*K) NOT_SOLARIS(max_uintx), \