--- a/src/hotspot/cpu/s390/assembler_s390.hpp	Tue Jun 05 23:06:32 2018 -0700
+++ b/src/hotspot/cpu/s390/assembler_s390.hpp	Wed Jun 06 10:11:23 2018 +0200
@@ -2967,6 +2967,7 @@
 
   // branch never (nop)
   inline void z_nop();
+  inline void nop(); // Used by shared code.
 
   // ===============================================================================================
 

--- a/src/hotspot/cpu/s390/assembler_s390.inline.hpp	Tue Jun 05 23:06:32 2018 -0700
+++ b/src/hotspot/cpu/s390/assembler_s390.inline.hpp	Wed Jun 06 10:11:23 2018 +0200
@@ -1311,6 +1311,7 @@
 
 // branch never (nop), branch always
 inline void Assembler::z_nop() { z_bcr(bcondNop, Z_R0); }
+inline void Assembler::nop() { z_nop(); }
 inline void Assembler::z_br(Register r2) { assert(r2 != Z_R0, "nop if target is Z_R0, use z_nop() instead"); z_bcr(bcondAlways, r2 ); }
 
 inline void Assembler::z_exrl(Register r1, Label& L) { z_exrl(r1, target(L)); }  // z10

--- a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp	Tue Jun 05 23:06:32 2018 -0700
+++ b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp	Wed Jun 06 10:11:23 2018 +0200
@@ -95,8 +95,6 @@
   void invalidate_registers(Register preserve1 = noreg, Register preserve2 = noreg,
                             Register preserve3 = noreg) PRODUCT_RETURN;
 
-  void nop() { z_nop(); }
-
   // This platform only uses signal-based null checks. The Label is not needed.
   void null_check(Register r, Label *Lnull = NULL) { MacroAssembler::null_check(r); }