Add S390 to architecture list

diff --git a/ChangeLog b/ChangeLog
index fb9a604e90f4ac353295a0bc349eef42b3ab592d..2514dfd9842591a54ec042f40f878b2cbc106a90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-13  Wichert Akkerman <wakkerma@debian.org>
+
+  * configure.in: add S390 to architecture list
+
 2001-07-10  John Hughes <john@Calva.COM>
 
   * TODO, defs.h, io.h, net.c, strace.c, syscall.c, util.c: Merge fixes
@@ -30,6 +34,7 @@
   * svr4/dummy.h, svr4/syscall.h: now we handle rfork{1,all}, ssisys and
     rexecve calls.
 
+>>>>>>> 1.119
 2001-04-12  Wichert Akkerman <wakkerma@debian.org>
 
   * process.c: fix cast for powerpc code

diff --git a/configure.in b/configure.in
index 1e8d2d8b1f126aac5e859403a0783846d716de45..dcac0172c66a4cd59be750b99dddaaf690b973cd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -76,7 +76,7 @@ AC_MSG_RESULT($arch)
 
 # Autoheader trick.  Heh, heh.
 arch_list='
-@@@syms="$syms I386 IA64 M68K SPARC MIPS ALPHA ARM POWERPC HPPA"@@@
+@@@syms="$syms I386 IA64 M68K SPARC MIPS ALPHA ARM POWERPC S390 HPPA"@@@
 '
 
 osarch="$opsys"