diff --git a/make/bsd/makefiles/mapfile-vers-debug b/make/bsd/makefiles/mapfile-vers-debug
index d6f7c09070771016a97ebcc639224e4846f1f9db..28532cb8cbf597a39984a9016e313855a181096d 100644
--- a/make/bsd/makefiles/mapfile-vers-debug
+++ b/make/bsd/makefiles/mapfile-vers-debug
@@ -82,6 +82,15 @@
                 _JVM_DumpAllStacks
                 _JVM_DumpThreads
                 _JVM_EnableCompiler
+                _JVM_ElasticHeapGetEvaluationMode
+                _JVM_ElasticHeapSetYoungGenCommitPercent
+                _JVM_ElasticHeapGetYoungGenCommitPercent
+                _JVM_ElasticHeapSetUncommitIHOP
+                _JVM_ElasticHeapGetUncommitIHOP
+                _JVM_ElasticHeapGetTotalYoungUncommittedBytes
+                _JVM_ElasticHeapSetSoftmxPercent
+                _JVM_ElasticHeapGetSoftmxPercent
+                _JVM_ElasticHeapGetTotalUncommittedBytes
                 _JVM_Exit
                 _JVM_FillInStackTrace
                 _JVM_FindClassFromCaller
diff --git a/make/bsd/makefiles/mapfile-vers-product b/make/bsd/makefiles/mapfile-vers-product
index 240e9d297138360425934dc31416dab4e6406b5d..64f05334d19695e34600fd20d0df5e89f45a7a32 100644
--- a/make/bsd/makefiles/mapfile-vers-product
+++ b/make/bsd/makefiles/mapfile-vers-product
@@ -82,6 +82,15 @@
                 _JVM_DumpAllStacks
                 _JVM_DumpThreads
                 _JVM_EnableCompiler
+                _JVM_ElasticHeapGetEvaluationMode
+                _JVM_ElasticHeapSetYoungGenCommitPercent
+                _JVM_ElasticHeapGetYoungGenCommitPercent
+                _JVM_ElasticHeapSetUncommitIHOP
+                _JVM_ElasticHeapGetUncommitIHOP
+                _JVM_ElasticHeapGetTotalYoungUncommittedBytes
+                _JVM_ElasticHeapSetSoftmxPercent
+                _JVM_ElasticHeapGetSoftmxPercent
+                _JVM_ElasticHeapGetTotalUncommittedBytes
                 _JVM_Exit
                 _JVM_FillInStackTrace
                 _JVM_FindClassFromCaller
diff --git a/make/linux/makefiles/mapfile-vers-product b/make/linux/makefiles/mapfile-vers-product
index 3da9896bc1f3563a9deab29714bc7b62ce7a54dd..08ff896ca226afa4e05c8f0d344f5bce3c64d03e 100644
--- a/make/linux/makefiles/mapfile-vers-product
+++ b/make/linux/makefiles/mapfile-vers-product
@@ -69,15 +69,6 @@ SUNWprivate_1.1 {
                 JVM_CurrentClassLoader;
                 JVM_CurrentLoadedClass;
                 JVM_CurrentThread;
-                JVM_ElasticHeapGetEvaluationMode;
-                JVM_ElasticHeapSetYoungGenCommitPercent;
-                JVM_ElasticHeapGetYoungGenCommitPercent;
-                JVM_ElasticHeapSetUncommitIHOP;
-                JVM_ElasticHeapGetUncommitIHOP;
-                JVM_ElasticHeapGetTotalYoungUncommittedBytes;
-                JVM_ElasticHeapSetSoftmxPercent;
-                JVM_ElasticHeapGetSoftmxPercent;
-                JVM_ElasticHeapGetTotalUncommittedBytes;
                 JVM_CurrentTimeMillis;
                 JVM_DefineClass;
                 JVM_DefineClassWithSource;
@@ -93,6 +84,15 @@ SUNWprivate_1.1 {
                 JVM_DumpAllStacks;
                 JVM_DumpThreads;
                 JVM_EnableCompiler;
+                JVM_ElasticHeapGetEvaluationMode;
+                JVM_ElasticHeapSetYoungGenCommitPercent;
+                JVM_ElasticHeapGetYoungGenCommitPercent;
+                JVM_ElasticHeapSetUncommitIHOP;
+                JVM_ElasticHeapGetUncommitIHOP;
+                JVM_ElasticHeapGetTotalYoungUncommittedBytes;
+                JVM_ElasticHeapSetSoftmxPercent;
+                JVM_ElasticHeapGetSoftmxPercent;
+                JVM_ElasticHeapGetTotalUncommittedBytes;
                 JVM_Exit;
                 JVM_FillInStackTrace;
                 JVM_FindClassFromCaller;
diff --git a/src/share/vm/gc_implementation/g1/elasticHeap.cpp b/src/share/vm/gc_implementation/g1/elasticHeap.cpp
index cff68940161ccb84df555d8d8894fb32a723cb8e..940f818fd9dc741b3af5a499ce7d2fcd036f412a 100644
--- a/src/share/vm/gc_implementation/g1/elasticHeap.cpp
+++ b/src/share/vm/gc_implementation/g1/elasticHeap.cpp
@@ -19,6 +19,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "precompiled.hpp"
 #include "gc_implementation/g1/g1CollectedHeap.hpp"
 #include "gc_implementation/g1/g1CollectorPolicy.hpp"
 #include "gc_implementation/g1/elasticHeap.hpp"
@@ -41,6 +42,7 @@ public:
     } else {
       _elastic_heap->uncommit_region_memory(hr);
     }
+    return false;
   }
 };
 
@@ -502,6 +504,7 @@ ElasticHeap::EvaluationMode ElasticHeapSetting::target_evaluation_mode(uint youn
     return ElasticHeap::SoftmxMode;
   } else {
     ShouldNotReachHere();
+    return ElasticHeap::InactiveMode;
   }
 }
 
diff --git a/src/share/vm/gc_implementation/g1/elasticHeap.hpp b/src/share/vm/gc_implementation/g1/elasticHeap.hpp
index 77564c22aa97b8bc6b6f7705858831ff988d8970..55a3b843714157f5b33bf52fbe71e34f456c4a1d 100644
--- a/src/share/vm/gc_implementation/g1/elasticHeap.hpp
+++ b/src/share/vm/gc_implementation/g1/elasticHeap.hpp
@@ -144,7 +144,7 @@ public:
   virtual void        evaluate_old()                    { ShouldNotReachHere(); }
   virtual void        evaluate_old_common();
 
-  virtual bool        ready_to_initial_mark()       { ShouldNotReachHere(); }
+  virtual bool        ready_to_initial_mark()       { ShouldNotReachHere(); return false; }
 };
 
 class RecoverEvaluator : public ElasticHeapEvaluator {
@@ -447,7 +447,7 @@ public:
   uint                young_percent() const {
     return _young_percent;
   }
-  uint                set_young_percent(uint p) {
+  void                set_young_percent(uint p) {
     _young_percent = p;
   }
   // Whether a jcmd/mxbean command set the uncommit ihop
diff --git a/src/share/vm/services/attachListener.cpp b/src/share/vm/services/attachListener.cpp
index 801b1ced5b7ba6efa380f1e49a06a75ae92f7160..8037e79bb954d8ca79f34ee71d69d93ca77e7a4b 100644
--- a/src/share/vm/services/attachListener.cpp
+++ b/src/share/vm/services/attachListener.cpp
@@ -259,7 +259,7 @@ static jint set_bool_flag(const char* name, AttachOperation* op, outputStream* o
     }
     value = (tmp != 0);
   }
-  if (strcmp(name, "ElasticHeapPeriodicUncommit") == 0 & value) {
+  if ((strcmp(name, "ElasticHeapPeriodicUncommit") == 0) && value) {
     if (G1ElasticHeap &&
         !G1CollectedHeap::heap()->elastic_heap()->can_turn_on_periodic_uncommit()) {
       out->print_cr("cannot be set because of illegal state.");