(alpha): Replace CPU-determining program with one that's more precise

and also supports pca56 and ev6.  Handle those in returned name.

diff --git a/config.guess b/config.guess
index e528b43396638e35ceff6466cecc5d21c3b4e9c6..413ed41c0f531d99735a9d894bda6b9dea887e5d 100755 (executable)
--- a/config.guess
+++ b/config.guess
@@ -65,9 +65,14 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 main:
        .frame \$30,0,\$26,0
        .prologue 0
-       .long 0x47e03d84
-       cmoveq \$4,0,\$3
-       addl \$3,\$31,\$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
        .end main
 EOF
@@ -75,12 +80,21 @@ EOF
        if test "$?" = 0 ; then
                ./dummy
                case "$?" in
-                       1)
+                       7)
+                               UNAME_MACHINE="alpha"
+                               ;;
+                       15)
                                UNAME_MACHINE="alphaev5"
                                ;;
-                       2)
+                       14)
                                UNAME_MACHINE="alphaev56"
                                ;;
+                       10)
+                               UNAME_MACHINE="alphapca56"
+                               ;;
+                       16)
+                               UNAME_MACHINE="alphaev6"
+                               ;;
                esac
        fi
        rm -f dummy.s dummy
@@ -503,9 +517,14 @@ EOF
        main:
                .frame \$30,0,\$26,0
                .prologue 0
-               .long 0x47e03d84
-               cmoveq \$4,0,\$3
-               addl \$3,\$31,\$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
                .end main
 EOF
@@ -514,12 +533,21 @@ EOF
                if test "$?" = 0 ; then
                        ./dummy
                        case "$?" in
-                               1)
-                                       UNAME_MACHINE="alphaev5"
-                               ;;      
-                       2)      
-                                       UNAME_MACHINE="alphaev56"
-                               ;;      
+                       7)
+                               UNAME_MACHINE="alpha"
+                               ;;
+                       15)
+                               UNAME_MACHINE="alphaev5"
+                               ;;
+                       14)
+                               UNAME_MACHINE="alphaev56"
+                               ;;
+                       10)
+                               UNAME_MACHINE="alphapca56"
+                               ;;
+                       16)
+                               UNAME_MACHINE="alphaev6"
+                               ;;
                        esac    
 
                        objdump --private-headers dummy | \