--- old/src/cpu/x86/vm/templateTable_x86_64.cpp	2014-01-30 14:36:47.582259010 -0800
+++ new/src/cpu/x86/vm/templateTable_x86_64.cpp	2014-01-30 14:36:47.488925681 -0800
@@ -107,10 +107,6 @@
   return Address(rsp,  Interpreter::expr_offset_in_bytes(2));
 }
 
-static inline Address at_tos_p3() {
-  return Address(rsp,  Interpreter::expr_offset_in_bytes(3));
-}
-
 // Condition conversion
 static Assembler::Condition j_not(TemplateTable::Condition cc) {
   switch (cc) {
--- old/src/share/vm/prims/jvmtiTagMap.cpp	2014-01-30 14:36:48.238925646 -0800
+++ new/src/share/vm/prims/jvmtiTagMap.cpp	2014-01-30 14:36:48.145592317 -0800
@@ -2790,6 +2790,9 @@
   return true;
 }
 
+#ifndef PRODUCT
+// Function only used in assert, which will be disabled with NDEBUG
+// ??? Somehow NDEBUG is not working, use PRODUCT
 // verify that a static oop field is in range
 static inline bool verify_static_oop(InstanceKlass* ik,
                                      oop mirror, int offset) {
@@ -2804,6 +2807,7 @@
     return false;
   }
 }
+#endif // #ifndef PRODUCT
 
 // a class references its super class, interfaces, class loader, ...
 // and finally its static fields
--- old/src/share/vm/runtime/mutex.cpp	2014-01-30 14:36:48.898925615 -0800
+++ new/src/share/vm/runtime/mutex.cpp	2014-01-30 14:36:48.808925619 -0800
@@ -280,16 +280,6 @@
   return x & 0x7FFFFFFF ;
 }
 
-static inline jint MarsagliaXOR (jint * const a) {
-  jint x = *a ;
-  if (x == 0) x = UNS(a)|1 ;
-  x ^= x << 6;
-  x ^= ((unsigned)x) >> 21;
-  x ^= x << 7 ;
-  *a = x ;
-  return x & 0x7FFFFFFF ;
-}
-
 static int Stall (int its) {
   static volatile jint rv = 1 ;
   volatile int OnFrame = 0 ;