--- old/hotspot/src/share/vm/utilities/globalDefinitions.hpp	2015-12-16 14:33:43.445356013 +0100
+++ new/hotspot/src/share/vm/utilities/globalDefinitions.hpp	2015-12-16 14:33:43.325356011 +0100
@@ -1059,7 +1059,7 @@
 
 // (These must be implemented as #defines because C++ compilers are
 // not obligated to inline non-integral constants!)
-#define       badAddress        ((address)::badAddressVal)
+#define       badAddress        ((address)(intptr_t)::badAddressVal)
 #define       badOop            (cast_to_oop(::badOopVal))
 #define       badHeapWord       (::badHeapWordVal)
 #define       badJNIHandle      (cast_to_oop(::badJNIHandleVal))