--- a/hotspot/src/cpu/s390/vm/sharedRuntime_s390.cpp Wed Jul 26 15:54:13 2017 +0800
+++ b/hotspot/src/cpu/s390/vm/sharedRuntime_s390.cpp Wed Jul 26 11:27:51 2017 +0200
@@ -542,7 +542,6 @@
}
}
-#if INCLUDE_CDS
size_t SharedRuntime::trampoline_size() {
return MacroAssembler::load_const_size() + 2;
}
@@ -552,7 +551,6 @@
__ load_const(Z_R1_scratch, destination);
__ z_br(Z_R1_scratch);
}
-#endif
// ---------------------------------------------------------------------------
void SharedRuntime::save_native_result(MacroAssembler * masm,