aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey A Law <law@cygnus.com>1997-11-21 17:07:04 +0000
committerJeff Law <law@gcc.gnu.org>1997-11-21 10:07:04 -0700
commit83cfe7c0113cda488989cdf937a48ce11f484d86 (patch)
tree926686f8b22c946a28ea9562feb3a443b31de300
parentca20257b8d8554e02ac3aa1c4943fccc28289503 (diff)
downloadgcc-83cfe7c0113cda488989cdf937a48ce11f484d86.zip
gcc-83cfe7c0113cda488989cdf937a48ce11f484d86.tar.gz
gcc-83cfe7c0113cda488989cdf937a48ce11f484d86.tar.bz2
config.guess (alpha stuff): Merge with FSF to avoid incorrect guesses.
* config.guess (alpha stuff): Merge with FSF to avoid incorrect guesses. From-SVN: r16639
-rw-r--r--ChangeLog5
-rwxr-xr-xconfig.guess61
2 files changed, 51 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 72473f3..50bcf7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 21 09:51:01 1997 Jeffrey A Law (law@cygnus.com)
+
+ * config.guess (alpha stuff): Merge with FSF to avoid incorrect
+ guesses.
+
Mon Oct 27 12:03:53 1997 Jason Merrill <jason@yorick.cygnus.com>
* Makefile.in: check-target-libio depends on all-target-libstdc++.
diff --git a/config.guess b/config.guess
index 1448103..413ed41 100755
--- a/config.guess
+++ b/config.guess
@@ -52,6 +52,9 @@ trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
alpha:OSF1:*:*)
+ if test $UNAME_RELEASE = "V4.0"; then
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ fi
# A Vn.n version is a released version.
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
@@ -62,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
@@ -72,16 +80,25 @@ 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
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
exit 0 ;;
21064:Windows_NT:50:3)
echo alpha-dec-winnt3.5
@@ -500,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
@@ -511,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 | \