diff --git a/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp b/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp
index cdb2013..5a7b298 100644
--- a/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp
@@ -409,6 +409,8 @@ void G1BarrierSetAssembler::resolve_jobject(MacroAssembler* masm, Register value
   __ bind(Ldone);
 }
 
+#ifdef COMPILER1
+
 #undef __
 #define __ ce->masm()->
 
@@ -611,3 +613,5 @@ void G1BarrierSetAssembler::generate_c1_post_barrier_runtime_stub(StubAssembler*
 }
 
 #undef __
+
+#endif // COMPILER1