diff src/share/vm/runtime/arguments.cpp @ 6928:8cb93eadfb6d hs25-b08

Merge
author amurillo
date Fri, 02 Nov 2012 07:35:41 -0700
parents acabb5c282f5 e81fbc04a942
children e522a00b91aa e4f764ddb06a
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp	Thu Nov 01 14:11:16 2012 -0700
+++ b/src/share/vm/runtime/arguments.cpp	Fri Nov 02 07:35:41 2012 -0700
@@ -257,6 +257,7 @@
   { "MaxPermHeapExpansion", JDK_Version::jdk(8),  JDK_Version::jdk(9) },
   { "CMSRevisitStackSize",           JDK_Version::jdk(8), JDK_Version::jdk(9) },
   { "PrintRevisitStats",             JDK_Version::jdk(8), JDK_Version::jdk(9) },
+  { "UseVectoredExceptions",         JDK_Version::jdk(8), JDK_Version::jdk(9) },
 #ifdef PRODUCT
   { "DesiredMethodLimit",
                            JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) },
@@ -2568,7 +2569,9 @@
          FLAG_SET_CMDLINE(uintx, MaxNewSize, NewSize);
       }
 
+#ifndef _ALLBSD_SOURCE  // UseLargePages is not yet supported on BSD.
       FLAG_SET_DEFAULT(UseLargePages, true);
+#endif
 
       // Increase some data structure sizes for efficiency
       FLAG_SET_CMDLINE(uintx, BaseFootPrintEstimate, MaxHeapSize);
@@ -3133,6 +3136,10 @@
   UNSUPPORTED_OPTION(UseG1GC, "G1 GC");
 #endif
 
+#ifdef _ALLBSD_SOURCE  // UseLargePages is not yet supported on BSD.
+  UNSUPPORTED_OPTION(UseLargePages, "-XX:+UseLargePages");
+#endif
+
 #if !INCLUDE_ALTERNATE_GCS
   if (UseParallelGC) {
     warning("Parallel GC is not supported in this VM.  Using Serial GC.");