--- a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp	Mon Aug 03 09:39:29 2015 +0200
+++ b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp	Mon Aug 03 05:05:40 2015 -0400
@@ -685,7 +685,8 @@
   } else {
     bl(pc());
   }
-  return start_offset;
+  // just need to return a non-null address
+  return pc();
 }