* config.guess: More accurate determination of HP processor types.

* config.sub: More accurate determination of HP processor types.
This commit is contained in:
Jeff Law 1998-01-28 06:16:52 +00:00
parent 16ce62054b
commit 5042ba8763
3 changed files with 148 additions and 19 deletions

View File

@ -1,3 +1,8 @@
Tue Jan 27 23:15:55 1998 Lassi A. Tuura <lat@iki.fi>
* config.guess: More accurate determination of HP processor types.
* config.sub: More accurate determination of HP processor types.
Sat Jan 24 01:59:45 1998 Manfred Hollstein <manfred@s-direktnet.de>
* configure (package_makefile_frag): Move inserting the

118
config.guess vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
# Copyright (C) 1992, 93-97, 1998 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@ -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
@ -344,8 +358,13 @@ EOF
case "${UNAME_MACHINE}" in
9000/31? ) HP_ARCH=m68000 ;;
9000/[34]?? ) HP_ARCH=m68k ;;
9000/7?? | 9000/8?[13679] ) HP_ARCH=hppa1.1 ;;
9000/8?? ) HP_ARCH=hppa1.0 ;;
9000/6?? ) HP_ARCH=hppa1.0 ;;
9000/78? ) HP_ARCH=hppa1.1 ;; # FIXME: really hppa2.0
9000/7?? ) HP_ARCH=hppa1.1 ;;
9000/8[67]1 | 9000/80[24] | 9000/8[78]9 | 9000/893 )
HP_ARCH=hppa1.1 ;; # FIXME: really hppa2.0
9000/8?[13679] ) HP_ARCH=hppa1.1 ;;
9000/8?? ) HP_ARCH=hppa1.0 ;;
esac
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@ -479,6 +498,12 @@ EOF
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit 0 ;;
*:Linux:*:*)
# uname on the ARM produces all sorts of strangeness, and we need to
# filter it out.
case "$UNAME_MACHINE" in
arm* | sa110*) UNAME_MACHINE="arm" ;;
esac
# The BFD linker knows what the default object file format is, so
# first see if it will tell us.
ld_help_string=`ld --help 2>&1`
@ -492,8 +517,38 @@ EOF
i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;;
i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;;
sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;;
elf32ppc)
# Determine Lib Version
cat >dummy.c <<EOF
#include <features.h>
#if defined(__GLIBC__)
extern char __libc_version[];
extern char __libc_release[];
#endif
main(argc, argv)
int argc;
char *argv[];
{
#if defined(__GLIBC__)
printf("%s %s\n", __libc_version, __libc_release);
#else
printf("unkown\n");
#endif
return 0;
}
EOF
LIBC=""
${CC-cc} dummy.c -o dummy 2>/dev/null
if test "$?" = 0 ; then
./dummy | grep 1\.99 > /dev/null
if test "$?" = 0 ; then
LIBC="libc1"
fi
fi
rm -f dummy.c dummy
echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
esac
if test "${UNAME_MACHINE}" = "alpha" ; then
@ -503,9 +558,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 +574,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 | \
@ -610,6 +679,13 @@ EOF
echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
fi
exit 0 ;;
i?86:*:5:7)
UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
&& UNAME_MACHINE=i586
echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
exit 0 ;;
i?86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@ -714,6 +790,12 @@ EOF
echo mips-unknown-sysv${UNAME_RELEASE}
fi
exit 0 ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
exit 0 ;;
BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
echo powerpc-apple-beos
exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2

44
config.sub vendored
View File

@ -81,6 +81,11 @@ case $1 in
set mips64tx49-unknown-elf
;;
# end-sanitize-tx49
# start-sanitize-vr4111
mips-vr4111-elf)
set mips64vr4111-unknown-elf
;;
# end-sanitize-vr4111
# start-sanitize-vr5400
mips64vr5xxx-elf)
set mips64vr5000-elf
@ -211,6 +216,11 @@ case $basic_machine in
mips64vr5000 | mips64vr5000el) # CYGNUS LOCAL ian/vr5000
basic_machine=$basic_machine-unknown
;;
# start-sanitize-vr4111
mips64vr4111 | mips64vr4111el)
basic_machine=$basic_machine-unknown
;;
# end-sanitize-vr4111
# start-sanitize-vr5400
mips64vr5400) # CYGNUS LOCAL cagney/vr5400
basic_machine=$basic_machine-unknown
@ -239,6 +249,11 @@ case $basic_machine in
basic_machine=$basic_machine-unknown
;;
# end-sanitize-tic80
# start-sanitize-sky
txvu)
basic_machine=$basic_machine-unknown
;;
# end-sanitize-sky
# start-sanitize-v850e
v850e) # CYGNUS LOCAL jtc/v850
basic_machine=$basic_machine-unknown
@ -284,6 +299,10 @@ case $basic_machine in
;;
thumb-*) # CYGNUS LOCAL angela/thumb
;;
# start-sanitize-sky
txvu-*)
;;
# end-sanitize-sky
v850-*) # CYGNUS LOCAL
;;
# start-sanitize-v850e
@ -300,6 +319,10 @@ case $basic_machine in
;;
mips64vr4100-* | mips64vr4100el-*) # CYGNUS LOCAL jsmith/vr4100
;;
# start-sanitize-vr4111
mips64vr4111-* | mips64vr4111el-*)
;;
# end-sanitize-vr4111
# start-sanitize-tx19
mipstx19-* | mipstx19el-*)
;;
@ -514,7 +537,22 @@ case $basic_machine in
hp9k3[2-9][0-9])
basic_machine=m68k-hp
;;
hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
hp9k6[0-9][0-9] | hp6[0-9][0-9] )
basic_machine=hppa1.0-hp
;;
hp9k7[0-79][0-9] | hp7[0-79][0-9] )
basic_machine=hppa1.1-hp
;;
hp9k78[0-9] | hp78[0-9] )
# FIXME: really hppa2.0-hp
basic_machine=hppa1.1-hp
;;
hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | \
hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893 )
# FIXME: really hppa2.0-hp
basic_machine=hppa1.1-hp
;;
hp9k8[0-9][13679] | hp8[0-9][13679] )
basic_machine=hppa1.1-hp
;;
hp9k8[0-9][0-9] | hp8[0-9][0-9])
@ -560,6 +598,10 @@ case $basic_machine in
basic_machine=i386-unknown
os=-go32
;;
i386-mingw32 | mingw32)
basic_machine=i386-unknown
os=-mingw32
;;
iris | iris4d)
basic_machine=mips-sgi
case $os in