Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it

extensively yet.

ProtocolKeepAlives is now just a compatibility alias for
ServerAliveInterval.

1 files changed, 13 insertions, 5 deletions

diff --git a/config.sub b/config.sub
index 79657cd18..d77dd77b4 100755
--- a/config.sub
+++ b/config.sub
@@ -162,10 +162,10 @@ case $os in
                 os=-chorusos
                 basic_machine=$1
                 ;;
-        -chorusrdb)
-                os=-chorusrdb
+        -chorusrdb)
+                os=-chorusrdb
                 basic_machine=$1
-                ;;
+                ;;
         -hiux*)
                 os=-hiuxwe2
                 ;;
@@ -926,6 +926,10 @@ case $basic_machine in
                 basic_machine=sv1-cray
                 os=-unicos
                 ;;
+        sx*-nec)
+                basic_machine=sx6-nec
+                os=-sysv
+                ;;
         symmetry)
                 basic_machine=i386-sequent
                 os=-dynix
@@ -1006,6 +1010,10 @@ case $basic_machine in
                 basic_machine=hppa1.1-winbond
                 os=-proelf
                 ;;
+        windows32)
+                basic_machine=i386-pc
+                os=-windows32-msvcrt
+                ;;
         xps | xps100)
                 basic_machine=xps100-honeywell
                 ;;
@@ -1102,8 +1110,8 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+        # First match some system type aliases
+        # that might get confused with valid system types.
         # -solaris* is a basic system type, with this one exception.
         -solaris1 | -solaris1.*)
                 os=`echo $os | sed -e 's|solaris1|sunos4|'`