config.guess version 2001-08-23 fails to give hppa2.0-hp-hpux10.20correctly

[rbrown64@csc.com.au]

bash-2.02$ ./config.guess.orig
hppa-hp-hpux10.20
bash-2.02$ ./config.guess
hppa2.0-hp-hpux10.20
bash-2.02$ uname -a
HP-UX banksia B.10.20 U 9000/800 1818781471 unlimited-user license
I'm waiting to get my corporate assignment reactivated. There is no new
code in the patch, just some rearrangement and an attempt at getting the
indentation correct.

2001-09-29  Rodney Brown  <rbrown64@csc.com.au>
     * config.guess(9000/[34678]??:HP-UX:*:*):
     Unconditionally try /usr/bin/getconf which is available on HP-UX 10.20.
     Move up eval $set_cc_for_build to avoid clobbering $dummy.c.

--- config.guess.orig    Fri Aug 31 16:35:37 2001
+++ config.guess    Sat Sep 29 19:47:45 2001
@@ -546,24 +546,24 @@ EOF
         9000/31? )            HP_ARCH=m68000 ;;
         9000/[34]?? )         HP_ARCH=m68k ;;
         9000/[678][0-9][0-9])
-              case "${HPUX_REV}" in
-                11.[0-9][0-9])
-                  if [ -x /usr/bin/getconf ]; then
-                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-                        esac ;;
-                    esac
-                  fi ;;
-              esac
+          if [ -x /usr/bin/getconf ]; then
+         sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+         sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+         case "${sc_cpu_version}" in
+           523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+           528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+           532)                      # CPU_PA_RISC2_0
+             case "${sc_kernel_bits}" in
+               32) HP_ARCH="hppa2.0n" ;;
+               64) HP_ARCH="hppa2.0w" ;;
+               '') HP_ARCH="hppa2.0" ;;      # HP-UX 10.20
+             esac ;;
+         esac
+          fi
               if [ "${HP_ARCH}" = "" ]; then
-              sed 's/^              //' << EOF >$dummy.c
+         # CC setup will clobber $dummy.c
+         eval $set_cc_for_build
+         sed 's/^              //' << EOF >$dummy.c

               #define _HPUX_SOURCE
               #include <stdlib.h>
@@ -596,11 +596,11 @@ EOF
                   exit (0);
               }
 EOF
-    eval $set_cc_for_build
-    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-    rm -f $dummy.c $dummy
-    fi ;;
+        (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) \
+         && HP_ARCH=`./$dummy`
+        if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+        rm -f $dummy.c $dummy
+      fi ;;
     esac
     echo ${HP_ARCH}-hp-hpux${HPUX_REV}
     exit 0 ;;