--- old/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp	2016-11-16 17:45:45.127833572 +0000
+++ new/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp	2016-11-16 17:45:44.887828324 +0000
@@ -1021,10 +1021,10 @@
                bool acquire, bool release, bool weak,
                Register result);
 
-  void cmpxchg_oop_shenandoah(Register res, Register addr, Register expected, Register new_val,
-                              bool narrow,
-                              bool acquire, bool release,
-                              Register tmp1 = rscratch1, Register tmp2 = rscratch2);
+  void cmpxchg_oop_shenandoah(Register addr, Register expected, Register new_val,
+                              enum operand_size size,
+                              bool acquire, bool release, bool weak,
+                              Register result = rscratch1, Register tmp2 = rscratch2);
   // Calls
 
   address trampoline_call(Address entry, CodeBuffer *cbuf = NULL);