diff -r a7c0f60a1294 -r 294e48b4f704 hotspot/src/cpu/aarch64/vm/methodHandles_aarch64.cpp
--- a/hotspot/src/cpu/aarch64/vm/methodHandles_aarch64.cpp	Mon Sep 28 15:05:02 2015 +0200
+++ b/hotspot/src/cpu/aarch64/vm/methodHandles_aarch64.cpp	Tue Sep 29 11:02:08 2015 +0200
@@ -50,7 +50,7 @@
 
 #ifdef ASSERT
 static int check_nonzero(const char* xname, int x) {
-  assert(x != 0, err_msg("%s should be nonzero", xname));
+  assert(x != 0, "%s should be nonzero", xname);
   return x;
 }
 #define NONZERO(x) check_nonzero(#x, x)
@@ -407,7 +407,7 @@
     }
 
     default:
-      fatal(err_msg_res("unexpected intrinsic %d: %s", iid, vmIntrinsics::name_at(iid)));
+      fatal("unexpected intrinsic %d: %s", iid, vmIntrinsics::name_at(iid));
       break;
     }