diff src/cpu/x86/vm/c2_globals_x86.hpp @ 6948:e522a00b91aa

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author Doug Simon <doug.simon@oracle.com>
date Mon, 12 Nov 2012 23:14:12 +0100
parents 33df1aeaebbf da91efe96a93
children 5fc51c1ecdeb
line wrap: on
line diff
--- a/src/cpu/x86/vm/c2_globals_x86.hpp	Mon Nov 12 18:11:17 2012 +0100
+++ b/src/cpu/x86/vm/c2_globals_x86.hpp	Mon Nov 12 23:14:12 2012 +0100
@@ -89,8 +89,7 @@
 define_pd_global(uintx,CodeCacheMinBlockLength,      4);
 
 // Heap related flags
-define_pd_global(uintx,PermSize,    ScaleForWordSize(16*M));
-define_pd_global(uintx,MaxPermSize, ScaleForWordSize(64*M));
+define_pd_global(uintx,MetaspaceSize,    ScaleForWordSize(16*M));
 
 // Ergonomics related flags
 define_pd_global(bool, NeverActAsServerClassMachine, false);