Rewrite Alpha subtype detection code for *bsd systems.

1 files changed, 25 insertions, 18 deletions

diff --git a/config.guess b/config.guess
index 1f4b682a7..6129dc083 100755
--- a/config.guess
+++ b/config.guess
@@ -110,31 +110,38 @@ alpha*-*-netbsd* | alpha*-*-freebsd* | alpha*-*-openbsd*)
   # can be removed.
 
   cat <<EOF >$dummy.s
+	.data
+Lformat:
+	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+	.text
 	.globl main
+	.align 4
 	.ent main
 main:
-	.frame \$30,0,\$26,0
-	.prologue 0
-	.long 0x47e03d80 # implver $0
-	lda \$2,259
-	.long 0x47e20c21 # amask $2,$1
-	srl \$1,8,\$2
-	sll \$2,2,\$2
-	sll \$0,3,\$0
-	addl \$1,\$0,\$0
-	addl \$2,\$0,\$0
-	ret \$31,(\$26),1
+	.frame \$30,16,\$26,0
+	ldgp \$29,0(\$27)
+	.prologue 1
+	.long 0x47e03d91 # implver \$17
+	lda \$2,-1
+	.long 0x47e20c21 # amask \$2,\$1
+	lda \$16,Lformat
+	not \$1,\$18
+	jsr \$26,printf
+	ldgp \$29,0(\$26)
+	mov 0,\$16
+	jsr \$26,exit
 	.end main
 EOF
   $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
   if test "$?" = 0 ; then
-    ./$dummy
-    case "$?" in
-     7) exact_cpu=alpha      ;;
-    15)	exact_cpu=alphaev5   ;;
-    14) exact_cpu=alphaev56  ;;
-    10)	exact_cpu=alphapca56 ;;
-    16)	exact_cpu=alphaev6   ;;
+    case `./$dummy` in
+     0-0)	exact_cpu=alpha      ;;
+    1-0)	exact_cpu=alphaev5   ;;
+    1-1)	exact_cpu=alphaev56  ;;
+    1-101)	exact_cpu=alphapca56 ;;
+    2-303)	exact_cpu=alphaev6   ;;
+    2-307)	exact_cpu=alphaev67  ;;
+    2-1307)	exact_cpu=alphaev68  ;;
     esac
   fi
   rm -f $dummy.s $dummy