diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 853884c3d00..03b8b699bf5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-04  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* config/s390/s390.c (s390_trampoline_template): Remove gen_rtx().
+
 2004-02-04  David Edelsohn  <edelsohn@gnu.org>
 
 	* reload.c (refers_to_regno_for_reload_p): Test regno, not inner_regno,
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 1aafdc6492a..343d1658225 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -6677,12 +6677,10 @@ s390_trampoline_template (FILE *file)
 void
 s390_initialize_trampoline (rtx addr, rtx fnaddr, rtx cxt)
 {
-  emit_move_insn (gen_rtx
-		  (MEM, Pmode,
+  emit_move_insn (gen_rtx_MEM (Pmode,
 		   memory_address (Pmode,
 		   plus_constant (addr, (TARGET_64BIT ? 20 : 12) ))), cxt);
-  emit_move_insn (gen_rtx
-		  (MEM, Pmode,
+  emit_move_insn (gen_rtx_MEM (Pmode,
 		   memory_address (Pmode,
 		   plus_constant (addr, (TARGET_64BIT ? 28 : 16) ))), fnaddr);
 }