diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 29f723374a2d..82fab1d8bb9e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-08  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* config/s390/tpf.h (ASM_SPEC): Define.
+
 2005-04-08  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* tree-flow.h: Remove the prototype for
diff --git a/gcc/config/s390/tpf.h b/gcc/config/s390/tpf.h
index 33a50b47498a..38df1b4bcbf8 100644
--- a/gcc/config/s390/tpf.h
+++ b/gcc/config/s390/tpf.h
@@ -101,6 +101,9 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #undef CPLUSPLUS_CPP_SPEC
 #define CPLUSPLUS_CPP_SPEC "-D_GNU_SOURCE %(cpp)"
 
+#undef  ASM_SPEC
+#define ASM_SPEC "%{m31&m64}%{mesa&mzarch}%{march=*}"
+
 #undef  LIB_SPEC
 #define LIB_SPEC "%{pthread:-lpthread} -lc"