RFR: Fix aarch64 build after merge

[Roman Kennke]

Made some mistakes in upstream merge. This fixes aarch64 build.

# HG changeset patch
# User rkennke
# Date 1529924410 14400
#      Mon Jun 25 07:00:10 2018 -0400
# Node ID 91fe3ac19469e1f2d997ffce7bdeebec574da93f
# Parent  ac148db384eed6f2a0ae507ac3f8d7b0fbab97d7
Fix aarch64 build after merge

diff -r ac148db384ee -r 91fe3ac19469
src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
--- a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
Fri Jun 22 12:01:19 2018 +0200
+++ b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
Mon Jun 25 07:00:10 2018 -0400
@@ -123,10 +123,6 @@
   __ ldr(obj, Address(obj, 0));             // *obj
 }

-void BarrierSetAssembler::obj_equals(MacroAssembler* masm, DecoratorSet
decorators, Register src1, Register src2) {
-  __ cmp(src1, src2);
-}
-
 void BarrierSetAssembler::resolve_for_read(MacroAssembler* masm,
DecoratorSet decorators, Register obj) {
   // Default to no-op.
 }
diff -r ac148db384ee -r 91fe3ac19469
src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp
--- a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp
Fri Jun 22 12:01:19 2018 +0200
+++ b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp
Mon Jun 25 07:00:10 2018 -0400
@@ -46,7 +46,6 @@
   virtual void try_resolve_jobject_in_native(MacroAssembler* masm,
Register jni_env,
                                              Register obj, Register
tmp, Label& slowpath);

-  virtual void obj_equals(MacroAssembler* masm, DecoratorSet
decorators, Register src1, Register src2);
   virtual void resolve_for_read(MacroAssembler* masm, DecoratorSet
decorators, Register obj);
   virtual void resolve_for_write(MacroAssembler* masm, DecoratorSet
decorators, Register obj);