diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp openjdk/hotspot/src/share/vm/runtime/arguments.cpp
--- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp	2010-03-11 14:46:20.000000000 +0000
+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp	2010-03-11 17:20:52.000000000 +0000
@@ -1268,7 +1268,7 @@
 
     // Feed the cache size setting into the JDK
     char buffer[1024];
-    sprintf(buffer, "java.lang.Integer.IntegerCache.high=%d", AutoBoxCacheMax);
+    sprintf(buffer, "java.lang.Integer.IntegerCache.high=" INTX_FORMAT, AutoBoxCacheMax);
     add_property(buffer);
   }
 #endif
diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/safepoint.cpp openjdk/hotspot/src/share/vm/runtime/safepoint.cpp
--- openjdk.orig/hotspot/src/share/vm/runtime/safepoint.cpp	2009-04-24 08:30:57.000000000 +0100
+++ openjdk/hotspot/src/share/vm/runtime/safepoint.cpp	2010-03-11 17:20:52.000000000 +0000
@@ -733,7 +733,7 @@
   if (DieOnSafepointTimeout) {
     char msg[1024];
     VM_Operation *op = VMThread::vm_operation();
-    sprintf(msg, "Safepoint sync time longer than %d ms detected when executing %s.",
+    sprintf(msg, "Safepoint sync time longer than " INTX_FORMAT " ms detected when executing %s.",
             SafepointTimeoutDelay,
             op != NULL ? op->name() : "no vm operation");
     fatal(msg);
diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/synchronizer.cpp openjdk/hotspot/src/share/vm/runtime/synchronizer.cpp
--- openjdk.orig/hotspot/src/share/vm/runtime/synchronizer.cpp	2009-04-24 08:30:57.000000000 +0100
+++ openjdk/hotspot/src/share/vm/runtime/synchronizer.cpp	2010-03-11 17:21:19.000000000 +0000
@@ -427,7 +427,7 @@
 // asserts is that error message -- often something about negative array
 // indices -- is opaque. 
 
-#define CTASSERT(x) { int tag[1-(2*!(x))]; printf ("Tag @%X\n", tag); } 
+#define CTASSERT(x) { int tag[1-(2*!(x))]; printf ("Tag @%p\n", tag); } 
 
 void ObjectMonitor::ctAsserts() { 
   CTASSERT(offset_of (ObjectMonitor, _header) == 0); 
diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/vmError.cpp openjdk/hotspot/src/share/vm/utilities/vmError.cpp
--- openjdk.orig/hotspot/src/share/vm/utilities/vmError.cpp	2010-03-11 14:46:19.000000000 +0000
+++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp	2010-03-11 17:20:52.000000000 +0000
@@ -313,7 +313,7 @@
 
          strncpy(buf, file, buflen);
          if (len + 10 < buflen) {
-           sprintf(buf + len, ":" SIZE_FORMAT, _lineno);
+           sprintf(buf + len, ":%d", _lineno);
          }
          st->print(" (%s)", buf);
        } else {