src/hotspot/cpu/aarch64/aarch64.ad

@@ -1139,11 +1139,11 @@
    //--------------------------------------------------------------
  
   public:
    // Size of call trampoline stub.
    static uint size_call_trampoline() {
-     return 0; // no call trampolines on this platform
+     return MacroAssembler::max_trampoline_stub_size(); // no call trampolines on this platform
    }
  
    // number of relocations needed by a call trampoline stub
    static uint reloc_call_trampoline() {
      return 0; // no call trampolines on this platform

@@ -3392,11 +3392,11 @@
        if (rtype == relocInfo::oop_type) {
          __ movoop(dst_reg, (jobject)con);
        } else if (rtype == relocInfo::metadata_type) {
          __ mov_metadata(dst_reg, (Metadata*)con);
        } else {
-         assert(rtype == relocInfo::none, "unexpected reloc type");
+         assert(rtype == relocInfo::none || rtype == relocInfo::external_word_type, "unexpected reloc type");
          if (! __ is_valid_AArch64_address(con) ||
              con < (address)(uintptr_t)os::vm_page_size()) {
            __ mov(dst_reg, con);
          } else {
            uint64_t offset;