--- old/src/hotspot/share/utilities/globalDefinitions.hpp	2018-11-14 15:02:07.391951383 +0100
+++ new/src/hotspot/share/utilities/globalDefinitions.hpp	2018-11-14 15:02:07.106950529 +0100
@@ -1072,7 +1072,7 @@
   return log2_intptr((uintptr_t)x);
 }
 
-inline int log2_long(long x) {
+inline int log2_long(jlong x) {
   return log2_long((unsigned long)x);
 }
 
@@ -1099,7 +1099,7 @@
     int value;
   };
   result = n;
-  if (value < 0) result = -result;
+  if (value < 0) result = 0-result;
   return result;
 }
 static inline unsigned long uabs(unsigned long n) {
@@ -1108,10 +1108,10 @@
     long value;
   };
   result = n;
-  if (value < 0) result = -result;
+  if (value < 0) result = 0-result;
   return result;
 }
-static inline unsigned long uabs(long n) { return uabs((unsigned long)n); }
+static inline unsigned long uabs(jlong n) { return uabs((unsigned long)n); }
 static inline unsigned int uabs(int n) { return uabs((unsigned int)n); }
 
 // "to" should be greater than "from."