diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 87f47288824d..c5a2a66470da 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-30  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* configure.ac (gcc_cv_as_dwarf2_debug_line): Enable test for
+	s390*-*-* targets by specifying a 'nop' insn.
+	* configure: Regenerate.
+
 2004-01-30  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
 	PR target/11475
diff --git a/gcc/configure b/gcc/configure
index 476538533e10..1c99d896b165 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -10918,7 +10918,7 @@ case "$target" in
   | xstormy16*-*-* | cris-*-* | xtensa-*-*)
     insn="nop"
     ;;
-  ia64*-*-*)
+  ia64*-*-* | s390*-*-*)
     insn="nop 0"
     ;;
   mmix-*-*)
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 28c32206d735..c29ddaa37a56 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -2472,7 +2472,7 @@ case "$target" in
   | xstormy16*-*-* | cris-*-* | xtensa-*-*)
     insn="nop"
     ;;
-  ia64*-*-*)
+  ia64*-*-* | s390*-*-*)
     insn="nop 0"
     ;;
   mmix-*-*)