changeset 50636:cd4bf3b1ee77

8201604: ARM64 - Build failure after JDK-8193260 Reviewed-by: aph
author bulasevich
date Fri, 11 May 2018 21:19:47 +0300
parents 66b0f0134aad
children a2322c683d17
files src/hotspot/cpu/arm/compiledIC_arm.cpp src/hotspot/cpu/arm/jvmciCodeInstaller_arm.cpp
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/cpu/arm/compiledIC_arm.cpp	Fri May 11 10:39:04 2018 -0700
+++ b/src/hotspot/cpu/arm/compiledIC_arm.cpp	Fri May 11 21:19:47 2018 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -91,6 +91,11 @@
 }
 #endif // COMPILER2_OR_JVMCI
 
+int CompiledStaticCall::to_trampoline_stub_size() {
+  // ARM doesn't use trampolines.
+  return 0;
+}
+
 // size of C2 call stub, compiled java to interpretor
 int CompiledStaticCall::to_interp_stub_size() {
   return 8 * NativeInstruction::instruction_size;
--- a/src/hotspot/cpu/arm/jvmciCodeInstaller_arm.cpp	Fri May 11 10:39:04 2018 -0700
+++ b/src/hotspot/cpu/arm/jvmciCodeInstaller_arm.cpp	Fri May 11 21:19:47 2018 +0300
@@ -52,7 +52,7 @@
   Unimplemented();
 }
 
-void CodeInstaller::pd_relocate_JavaMethod(Handle hotspot_method, jint pc_offset, TRAPS) {
+void CodeInstaller::pd_relocate_JavaMethod(CodeBuffer &cbuf, Handle hotspot_method, jint pc_offset, TRAPS) {
   Unimplemented();
 }