2002-08-13  John David Anglin  <dave@hiauly1.hia.nrc.ca>

	* config.guess (9000/[34678]??:HP-UX:*:*): For 64-bit kernels, set
	HP_ARCH to hppa64 if the code level of CC_FOR_BUILD is 2.0w or 2.0W.

--- config.guess.orig	Mon Jan  7 17:09:42 2002
+++ config.guess	Tue Aug 13 15:20:07 2002
@@ -603,6 +603,20 @@
 		    rm -f $dummy.c $dummy
 		fi ;;
 	esac
+	if [ "${HP_ARCH}" = "hppa2.0w" ]; then
+	  # Check if the arch should be hppa2.0w or hppa64.
+	  eval $set_cc_for_build
+	  sed 's/^	//' << EOF >$dummy.c
+	int main () {}
+EOF
+	  (CCOPTS= $CC_FOR_BUILD $dummy.c -S) && HP_LEVEL=`awk '{if (NR==1) print $2}' $dummy.s`
+	  rm -f $dummy.c $dummy.s
+	  case ${HP_LEVEL} in
+	  2.0w | 2.0W)
+	    HP_ARCH=hppa64
+	    ;;
+	  esac
+	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
     ia64:HP-UX:*:*)