[aarch64-port-dev ] Minor fixes

[Andrew Haley]

I backed out this patch:

diff -r 2fceb893cf2a -r 9fb292e8c1c6 src/cpu/aarch64/vm/stubRoutines_aarch64.hpp
--- a/src/cpu/aarch64/vm/stubRoutines_aarch64.hpp	Wed Jul 10 13:19:59 2013 +0100
+++ b/src/cpu/aarch64/vm/stubRoutines_aarch64.hpp	Mon Jul 15 12:57:07 2013 +0100
@@ -37,7 +37,8 @@
 // latter address is sued by the stack unwind code when doign an
 // exception return.
 static bool    returns_to_call_stub(address return_pc)   {
-  return return_pc == _call_stub_return_address + (NotifySimulator ? -4 : 0);
+  return return_pc == _call_stub_return_address +
+        (NotifySimulator ? PRODUCT_ONLY(0) NOT_PRODUCT(-4) : 0);
 }

 enum platform_dependent_constants {

because it's the wrong fix.  The right patch is:

diff -r f5c400b0528b src/cpu/aarch64/vm/stubGenerator_aarch64.cpp
--- a/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp	Mon Jul 08 18:52:40 2013 +0100
+++ b/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp	Tue Jul 16 15:51:29 2013 +0100
@@ -294,7 +294,6 @@
     __ mov(r13, sp);
     __ blr(c_rarg4);

-#ifndef PRODUCT
     // tell the simulator we have returned to the stub

     // we do this here because the notify will already have been done
@@ -309,7 +308,6 @@
     if (NotifySimulator) {
       __ notify(Assembler::method_reentry);
     }
-#endif
     // save current address for use by exception handling code

     return_address = __ pc();

If NotifySimulator is on we must honour it, regardless of whether it's a product
build or not.

Andrew.