# HG changeset patch
# User dlong
# Date 1425450676 18000
# Node ID c159f0c42cdac84029d58914fbabed4543a1422d
# Parent  47e6df07ca930fffd40e1268b0f8a140bf892b44# Parent  1f60a119863a02e18f64c994f2bbe136937c6f76
Merge

diff -r 47e6df07ca93 -r c159f0c42cda .hgtags
--- a/.hgtags	Wed Mar 04 01:20:40 2015 -0500
+++ b/.hgtags	Wed Mar 04 01:31:16 2015 -0500
@@ -593,3 +593,5 @@
 38f6080523831ae9a6907c780f2042b82f3213ca jdk8u60-b02
 9d6eb2757167744a17ea71f8b860430d70941eda jdk8u60-b03
 0fb1ac49ae7764c5d7c6dfb9fe046d0e1a4eb5aa hs25.60-b04
+586a449cd30332dd53c0f74bf2ead6f3d4724bfc jdk8u60-b04
+74931e85352be8556eaa511ca0dd7c38fe272ec3 hs25.60-b05
diff -r 47e6df07ca93 -r c159f0c42cda make/hotspot_version
--- a/make/hotspot_version	Wed Mar 04 01:20:40 2015 -0500
+++ b/make/hotspot_version	Wed Mar 04 01:31:16 2015 -0500
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=60
-HS_BUILD_NUMBER=05
+HS_BUILD_NUMBER=06
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8
diff -r 47e6df07ca93 -r c159f0c42cda src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Wed Mar 04 01:20:40 2015 -0500
+++ b/src/share/vm/runtime/arguments.cpp	Wed Mar 04 01:31:16 2015 -0500
@@ -1572,7 +1572,7 @@
 
 void Arguments::select_gc() {
   if (!gc_selected()) {
-    ArgumentsExt::select_gc_ergonomically();
+    select_gc_ergonomically();
   }
 }
 
@@ -2067,7 +2067,7 @@
 }
 
 // Check consistency of GC selection
-bool Arguments::check_gc_consistency_user() {
+bool Arguments::check_gc_consistency() {
   check_gclog_consistency();
   bool status = true;
   // Ensure that the user has not selected conflicting sets
@@ -2233,7 +2233,7 @@
     FLAG_SET_DEFAULT(UseGCOverheadLimit, false);
   }
 
-  status = status && check_gc_consistency_user();
+  status = status && check_gc_consistency();
   status = status && check_stack_pages();
 
   if (CMSIncrementalMode) {
@@ -4006,7 +4006,7 @@
   set_shared_spaces_flags();
 
   // Check the GC selections again.
-  if (!ArgumentsExt::check_gc_consistency_ergo()) {
+  if (!check_gc_consistency()) {
     return JNI_EINVAL;
   }
 
diff -r 47e6df07ca93 -r c159f0c42cda src/share/vm/runtime/arguments.hpp
--- a/src/share/vm/runtime/arguments.hpp	Wed Mar 04 01:20:40 2015 -0500
+++ b/src/share/vm/runtime/arguments.hpp	Wed Mar 04 01:31:16 2015 -0500
@@ -466,8 +466,7 @@
   static bool verify_MaxHeapFreeRatio(FormatBuffer<80>& err_msg, uintx max_heap_free_ratio);
 
   // Check for consistency in the selection of the garbage collector.
-  static bool check_gc_consistency_user();        // Check user-selected gc
-  static inline bool check_gc_consistency_ergo(); // Check ergonomic-selected gc
+  static bool check_gc_consistency();        // Check user-selected gc
   static void check_deprecated_gcs();
   static void check_deprecated_gc_flags();
   // Check consistecy or otherwise of VM argument settings
@@ -615,8 +614,4 @@
     UseParNewGC || UseSerialGC;
 }
 
-bool Arguments::check_gc_consistency_ergo() {
-  return check_gc_consistency_user();
-}
-
 #endif // SHARE_VM_RUNTIME_ARGUMENTS_HPP
diff -r 47e6df07ca93 -r c159f0c42cda src/share/vm/runtime/arguments_ext.hpp
--- a/src/share/vm/runtime/arguments_ext.hpp	Wed Mar 04 01:20:40 2015 -0500
+++ b/src/share/vm/runtime/arguments_ext.hpp	Wed Mar 04 01:31:16 2015 -0500
@@ -30,22 +30,12 @@
 
 class ArgumentsExt: AllStatic {
 public:
-  static inline void select_gc_ergonomically();
   static inline void set_gc_specific_flags();
-  static inline bool check_gc_consistency_ergo();
   static        void process_options(const JavaVMInitArgs* args) {}
 };
 
-void ArgumentsExt::select_gc_ergonomically() {
-  Arguments::select_gc_ergonomically();
-}
-
 void ArgumentsExt::set_gc_specific_flags() {
   Arguments::set_gc_specific_flags();
 }
 
-bool ArgumentsExt::check_gc_consistency_ergo() {
-  return Arguments::check_gc_consistency_ergo();
-}
-
 #endif // SHARE_VM_RUNTIME_ARGUMENTS_EXT_HPP