Index: readline-4.1/support/config.guess diff -c readline-4.1/support/config.guess:1.1.1.1 readline-4.1/support/config.guess:1.2 *** readline-4.1/support/config.guess:1.1.1.1 Wed Mar 21 23:50:15 2001 --- readline-4.1/support/config.guess Wed Mar 21 23:52:07 2001 *************** *** 1,6 **** #! /bin/sh # Attempt to guess a canonical system name. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996 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 --- 1,7 ---- #! /bin/sh # Attempt to guess a canonical system name. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 ! # 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 *************** *** 22,28 **** # the same distribution terms that you use for the rest of that program. # Written by Per Bothner . ! # The master version of this file is at the FSF in /home/gd/gnu/lib. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and --- 23,29 ---- # the same distribution terms that you use for the rest of that program. # Written by Per Bothner . ! # Please send patches to . # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and *************** *** 48,174 **** fi fi # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 8/24/94.) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH - elif (test -f /usr/5bin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/usr/5bin fi - UNAME=`(uname) 2>/dev/null` || UNAME=unknown UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - RELEASE=`expr "$UNAME_RELEASE" : '[^0-9]*\([0-9]*\)'` # 4 - case "$RELEASE" in - "") RELEASE=0 ;; - *) RELEASE=`expr "$RELEASE" + 0` ;; - esac - REL_LEVEL=`expr "$UNAME_RELEASE" : '[^0-9]*[0-9]*.\([0-9]*\)'` # 1 - REL_SUBLEVEL=`expr "$UNAME_RELEASE" : '[^0-9]*[0-9]*.[0-9]*.\([0-9]*\)'` # 2 - dummy=dummy-$$ trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15 - # Some versions of i386 SVR4.2 make `uname' equivalent to `uname -n', which - # is contrary to all other versions of uname - if [ -n "$UNAME" ] && [ "$UNAME_S" != "$UNAME" ] && [ "$UNAME_S" = UNIX_SV ]; then - UNAME=UNIX_SV - fi - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ! # Begin cases added for Bash ! alpha:NetBSD:*:*) ! echo alpha-dec-netbsd${UNAME_RELEASE} ! exit 0 ;; ! alpha:OpenBSD:*:*) ! echo alpha-dec-openbsd${UNAME_RELEASE} ! exit 0 ;; ! i?86:NetBSD:*:*) ! echo ${UNAME_MACHINE}-pc-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ! exit 0 ;; ! i?86:OpenBSD:*:*) ! echo ${UNAME_MACHINE}-pc-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ! exit 0 ;; ! sparc:NetBSD:*:*) ! echo sparc-unknown-netbsd${UNAME_RELEASE} ! exit 0 ;; ! sparc:OpenBSD:*:*) ! echo sparc-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! vax:NetBSD:*:*) ! echo vax-dec-netbsd${UNAME_RELEASE} ! exit 0 ;; ! vax:OpenBSD:*:*) ! echo vax-dec-openbsd${UNAME_RELEASE} ! exit 0 ;; ! mac68k:machten:*:*) ! echo mac68k-apple-machten${UNAME_RELEASE} ! exit 0 ;; ! concurrent*:*:*:*) ! if test "`(/bin/universe) 2>/dev/null`" = att ; then ! echo concurrent-concurrent-sysv3 else ! echo concurrent-concurrent-bsd fi exit 0 ;; - ppc*:SunOS:5.*:*) - echo ppc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - sparc:UNIX_SV:4.*:*) - echo sparc-unknown-sysv${UNAME_RELEASE} - exit 0 ;; - mips:UNIX_SV:4.*:*) - echo mips-mips-sysv${UNAME_RELEASE} - exit 0 ;; - mips:OSF*1:*:*) - echo mips-mips-osf1 - exit 0 ;; - mips:4.4BSD:*:*) - echo mips-mips-bsd4.4 - exit 0 ;; - MIServer-S:SMP_DC.OSx:*:dcosx) - echo mips-pyramid-sysv4 - exit 0 ;; - news*:NEWS*:*:*) - echo mips-sony-newsos${UNAME_RELEASE} - exit 0 ;; - i?86:NEXTSTEP:*:*) - echo i386-next-nextstep${RELEASE} - exit 0 ;; - *680?0:NEXTSTEP:*:*) - echo m68k-next-nextstep${RELEASE} - exit 0 ;; - *370:AIX:*:*) - echo ibm370-ibm-aix - exit 0 ;; - ksr1:OSF*1:*:*) - echo ksr1-ksr-osf1 - exit 0 ;; - esa:OSF*1:*:* | ESA:OSF*:*:*) - echo esa-ibm-osf1 - exit 0 ;; - DNP*:DNIX:*:*) - echo m68k-dnix-sysv - exit 0 ;; - *3b2*:*:*:*) - echo we32k-att-sysv3 - exit 0 ;; - *:QNX:*:42*) - echo i386-qssl-qnx`echo ${UNAME_VERSION}` - exit 0 ;; - Alpha*:Windows:NT:*:SP*) - echo alpha-pc-opennt - exit 0 ;; - *:Windows:NT:*:SP*) - echo intel-pc-opennt - exit 0 ;; - # end cases added for Bash alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` --- 49,109 ---- fi fi + # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 8/24/94.) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown dummy=dummy-$$ trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15 # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ! *:NetBSD:*:*) ! # Netbsd (nbsd) targets should (where applicable) match one or ! # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ! # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently ! # switched to ELF, *-*-netbsd* would select the old ! # object file format. This provides both forward ! # compatibility and a consistent mechanism for selecting the ! # object file format. ! # Determine the machine/vendor (is the vendor relevant). ! case "${UNAME_MACHINE}" in ! amiga) machine=m68k-cbm ;; ! arm32) machine=arm-unknown ;; ! atari*) machine=m68k-atari ;; ! sun3*) machine=m68k-sun ;; ! mac68k) machine=m68k-apple ;; ! macppc) machine=powerpc-apple ;; ! hp3[0-9][05]) machine=m68k-hp ;; ! ibmrt|romp-ibm) machine=romp-ibm ;; ! *) machine=${UNAME_MACHINE}-unknown ;; ! esac ! # The Operating System including object format. ! if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ ! | grep __ELF__ >/dev/null ! then ! # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). ! # Return netbsd for either. FIX? ! os=netbsd else ! os=netbsdelf fi + # The OS release + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" exit 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` *************** *** 178,240 **** # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. cat <$dummy.s .globl main .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 .end main EOF $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null if test "$?" = 0 ; then ! ./$dummy ! case "$?" in ! 7) UNAME_MACHINE="alpha" ;; ! 15) UNAME_MACHINE="alphaev5" ;; ! 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]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) ! # How do we know it's Interix rather than the generic POSIX subsystem? ! # Should we change UNAME_MACHINE based on the output of uname instead ! # of the specific Alpha model? ! echo alpha-pc-interix ! exit 0 ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 exit 0 ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-cbm-sysv4 exit 0;; - amiga:NetBSD:*:*) - echo m68k-cbm-netbsd${UNAME_RELEASE} - exit 0 ;; amiga:OpenBSD:*:*) ! echo m68k-cbm-openbsd${UNAME_RELEASE} exit 0 ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos --- 113,182 ---- # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. cat <$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,16,\$26,0 ! ldgp \$29,0(\$27) ! .prologue 1 ! .long 0x47e03d80 # implver \$0 ! lda \$2,-1 ! .long 0x47e20c21 # amask \$2,\$1 ! lda \$16,\$Lformat ! mov \$0,\$17 ! 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 ! case `./$dummy` in ! 0-0) UNAME_MACHINE="alpha" ;; ! 1-0) UNAME_MACHINE="alphaev5" ;; ! 1-1) UNAME_MACHINE="alphaev56" ;; ! 1-101) UNAME_MACHINE="alphapca56" ;; ! 2-303) UNAME_MACHINE="alphaev6" ;; + 2-307) + UNAME_MACHINE="alphaev67" + ;; esac fi rm -f $dummy.s $dummy echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) ! # How do we know it's Interix rather than the generic POSIX subsystem? ! # Should we change UNAME_MACHINE based on the output of uname instead ! # of the specific Alpha model? ! echo alpha-pc-interix ! exit 0 ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 exit 0 ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-cbm-sysv4 exit 0;; amiga:OpenBSD:*:*) ! echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos *************** *** 257,268 **** wgrisc:OpenBSD:*:*) echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; - arm32:NetBSD:*:*) - echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; SR2?01:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp exit 0;; --- 199,210 ---- wgrisc:OpenBSD:*:*) echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; SR2?01:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp exit 0;; *************** *** 274,285 **** echo pyramid-pyramid-bsd fi exit 0 ;; ! NILE:*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; sun4H:SunOS:5.*:*) ! echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ! exit 0 ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; --- 216,227 ---- echo pyramid-pyramid-bsd fi exit 0 ;; ! NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; sun4H:SunOS:5.*:*) ! echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ! exit 0 ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; *************** *** 319,347 **** aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; - atari*:NetBSD:*:*) - echo m68k-atari-netbsd${UNAME_RELEASE} - exit 0 ;; atari*:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not ! # "atarist" or "atariste" at least should have a processor # > m68000). The system name ranges from "MiNT" over "FreeMiNT" # to the lowercase version "mint" (or "freemint"). Finally # the system name "TOS" denotes a system which is actually not # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) ! echo m68k-atari-mint${UNAME_RELEASE} ! exit 0 ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) ! echo m68k-atari-mint${UNAME_RELEASE} ! exit 0 ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) ! echo m68k-atari-mint${UNAME_RELEASE} ! exit 0 ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} exit 0 ;; --- 261,286 ---- aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; atari*:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not ! # "atarist" or "atariste" at least should have a processor # > m68000). The system name ranges from "MiNT" over "FreeMiNT" # to the lowercase version "mint" (or "freemint"). Finally # the system name "TOS" denotes a system which is actually not # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) ! echo m68k-atari-mint${UNAME_RELEASE} ! exit 0 ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) ! echo m68k-atari-mint${UNAME_RELEASE} ! exit 0 ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) ! echo m68k-atari-mint${UNAME_RELEASE} ! exit 0 ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} exit 0 ;; *************** *** 351,365 **** *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; - sun3*:NetBSD:*:*) - echo m68k-sun-netbsd${UNAME_RELEASE} - exit 0 ;; sun3*:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - mac68k:NetBSD:*:*) - echo m68k-apple-netbsd${UNAME_RELEASE} - exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; --- 290,298 ---- *************** *** 369,383 **** mvme88k:OpenBSD:*:*) echo m88k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - *:"Mac OS":*:*) - echo `uname -p`-apple-macos${UNAME_RELEASE} - exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; - macppc:NetBSD:*:*) - echo powerpc-apple-netbsd${UNAME_RELEASE} - exit 0 ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit 0 ;; --- 302,310 ---- *************** *** 393,398 **** --- 320,326 ---- mips:*:*:UMIPS | mips:*:*:RISCos) sed 's/^ //' << EOF >$dummy.c #ifdef __cplusplus + #include /* for printf() prototype */ int main (int argc, char *argv[]) { #else int main (argc, argv) int argc; char *argv[]; { *************** *** 430,446 **** echo m88k-motorola-sysv3 exit 0 ;; AViiON:dgux:*:*) ! # DG/UX returns AViiON for all architectures ! UNAME_PROCESSOR=`/usr/bin/uname -p` ! if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then ! if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \ ! -o ${TARGET_BINARY_INTERFACE}x = x ] ; then echo m88k-dg-dgux${UNAME_RELEASE} ! else echo m88k-dg-dguxbcs${UNAME_RELEASE} ! fi else ! echo i586-dg-dgux${UNAME_RELEASE} fi exit 0 ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) --- 358,376 ---- echo m88k-motorola-sysv3 exit 0 ;; AViiON:dgux:*:*) ! # DG/UX returns AViiON for all architectures ! UNAME_PROCESSOR=`/usr/bin/uname -p` ! if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] ! then ! if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ ! [ ${TARGET_BINARY_INTERFACE}x = x ] ! then echo m88k-dg-dgux${UNAME_RELEASE} ! else echo m88k-dg-dguxbcs${UNAME_RELEASE} ! fi else ! echo i586-dg-dgux${UNAME_RELEASE} fi exit 0 ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) *************** *** 496,517 **** fi if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` - elif grep bos410 /usr/include/stdio.h >/dev/null 2>&1; then - IBM_REV=4.1 - elif grep bos411 /usr/include/stdio.h >/dev/null 2>&1; then - IBM_REV=4.1.1 else IBM_REV=4.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} exit 0 ;; *:AIX:*:*) echo rs6000-ibm-aix exit 0 ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 exit 0 ;; ! ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to exit 0 ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) --- 426,456 ---- fi if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else IBM_REV=4.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} exit 0 ;; + *:AIX:*:5) + case "`lsattr -El proc0 -a type -F value`" in + PowerPC*) IBM_ARCH=powerpc + IBM_CPU=ibm ;; + Itanium) IBM_ARCH=ia64 + IBM_CPU=intel ;; + POWER*) IBM_ARCH=power + IBM_CPU=ibm ;; + *) IBM_ARCH=powerpc + IBM_CPU=ibm ;; + esac + echo ${IBM_ARCH}-${IBM_CPU}-aix${UNAME_VERSION}.${UNAME_RELEASE} + exit 0 ;; *:AIX:*:*) echo rs6000-ibm-aix exit 0 ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 exit 0 ;; ! ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to exit 0 ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) *************** *** 528,537 **** exit 0 ;; 9000/[34678]??:HP-UX:*:*) case "${UNAME_MACHINE}" in ! 9000/31? ) HP_ARCH=m68000 ;; ! 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) sed 's/^ //' << EOF >$dummy.c #include #include --- 467,478 ---- exit 0 ;; 9000/[34678]??:HP-UX:*:*) case "${UNAME_MACHINE}" in ! 9000/31? ) HP_ARCH=m68000 ;; ! 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE #include #include *************** *** 562,568 **** exit (0); } EOF ! ($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` rm -f $dummy.c $dummy esac HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` --- 503,509 ---- exit (0); } EOF ! (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` rm -f $dummy.c $dummy esac HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` *************** *** 605,612 **** echo hppa1.0-hp-bsd exit 0 ;; *9??*:MPE/iX:*:*) ! echo hppa1.0-hp-mpeix ! exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf exit 0 ;; --- 546,553 ---- echo hppa1.0-hp-bsd exit 0 ;; *9??*:MPE/iX:*:*) ! echo hppa1.0-hp-mpeix ! exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf exit 0 ;; *************** *** 624,631 **** echo hppa1.1-hp-lites exit 0 ;; hppa*:OpenBSD:*:*) ! echo hppa-unknown-openbsd ! exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; --- 565,572 ---- echo hppa1.1-hp-lites exit 0 ;; hppa*:OpenBSD:*:*) ! echo hppa-unknown-openbsd ! exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; *************** *** 656,725 **** -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ exit 0 ;; CRAY*TS:*:*:*) ! echo t90-cray-unicos${UNAME_RELEASE} exit 0 ;; CRAY*T3E:*:*:*) ! echo alpha-cray-unicosmk${UNAME_RELEASE} ! exit 0 ;; CRAY-2:*:*:*) echo cray2-cray-unicos exit 0 ;; F300:UNIX_System_V:*:*) ! FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ! FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ! echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ! exit 0 ;; F301:UNIX_System_V:*:*) ! echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` ! exit 0 ;; ! hp3[0-9][05]:NetBSD:*:*) ! echo m68k-hp-netbsd${UNAME_RELEASE} ! exit 0 ;; hp300:OpenBSD:*:*) ! echo m68k-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! i?86:BSD/386:*:* | i?86:BSD/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; sparc*:BSD/OS:*:*) ! echo sparc-unknown-bsdi${UNAME_RELEASE} ! exit 0 ;; *:BSD/OS:*:*) ! echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} ! exit 0 ;; ! *:FreeBSD:*:*) ! if test -x /usr/bin/objformat; then ! if test "elf" = "`/usr/bin/objformat`"; then ! echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'` ! exit 0 ! fi ! fi ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-=(].*//'` exit 0 ;; ! *:NetBSD:*:*) ! echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` exit 0 ;; i*:CYGWIN*:*) ! echo ${UNAME_MACHINE}-pc-cygwin32 exit 0 ;; i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) ! # How do we know it's Interix rather than the generic POSIX subsystem? ! # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we ! # UNAME_MACHINE based on the output of uname instead of i386? ! echo i386-pc-interix ! exit 0 ;; i*:UWIN*:*) ! echo ${UNAME_MACHINE}-pc-uwin ! exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin ! exit 0 ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; --- 597,657 ---- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ exit 0 ;; CRAY*TS:*:*:*) ! echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*T3E:*:*:*) ! echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ! exit 0 ;; ! CRAY*SV1:*:*:*) ! echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ! exit 0 ;; CRAY-2:*:*:*) echo cray2-cray-unicos exit 0 ;; F300:UNIX_System_V:*:*) ! FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ! FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ! echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ! exit 0 ;; F301:UNIX_System_V:*:*) ! echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` ! exit 0 ;; hp300:OpenBSD:*:*) ! echo m68k-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; sparc*:BSD/OS:*:*) ! echo sparc-unknown-bsdi${UNAME_RELEASE} ! exit 0 ;; *:BSD/OS:*:*) ! echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; ! *:FreeBSD:*:*) ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` exit 0 ;; i*:CYGWIN*:*) ! echo ${UNAME_MACHINE}-pc-cygwin exit 0 ;; i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) ! # How do we know it's Interix rather than the generic POSIX subsystem? ! # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we ! # UNAME_MACHINE based on the output of uname instead of i386? ! echo i386-pc-interix ! exit 0 ;; i*:UWIN*:*) ! echo ${UNAME_MACHINE}-pc-uwin ! exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin ! exit 0 ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; *************** *** 727,741 **** 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 - armv*) UNAME_MACHINE=$UNAME_MACHINE ;; - 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. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. ld_help_string=`cd /; ld --help 2>&1` ld_supported_emulations=`echo $ld_help_string \ --- 659,667 ---- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; *:Linux:*:*) # The BFD linker knows what the default object file format is, so ! # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. ld_help_string=`cd /; ld --help 2>&1` ld_supported_emulations=`echo $ld_help_string \ *************** *** 744,756 **** s/.*supported emulations: *// s/ .*// p'` ! case "$ld_supported_emulations" in ! *ia64) echo "${UNAME_MACHINE}-unknown-linux" ; exit 0 ;; ! 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 | elf32ppclinux) # Determine Lib Version cat >$dummy.c <$dummy.c <$dummy.s ! .globl main ! .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 ! .end main EOF LIBC="" $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null if test "$?" = 0 ; then ! ./$dummy ! case "$?" in ! 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 | \ --- 734,794 ---- 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 ! cat <$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,16,\$26,0 ! ldgp \$29,0(\$27) ! .prologue 1 ! .long 0x47e03d80 # implver \$0 ! lda \$2,-1 ! .long 0x47e20c21 # amask \$2,\$1 ! lda \$16,\$Lformat ! mov \$0,\$17 ! not \$1,\$18 ! jsr \$26,printf ! ldgp \$29,0(\$26) ! mov 0,\$16 ! jsr \$26,exit ! .end main EOF LIBC="" $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null if test "$?" = 0 ; then ! case `./$dummy` in ! 0-0) UNAME_MACHINE="alpha" ;; ! 1-0) UNAME_MACHINE="alphaev5" ;; ! 1-1) UNAME_MACHINE="alphaev56" ;; ! 1-101) UNAME_MACHINE="alphapca56" ;; ! 2-303) UNAME_MACHINE="alphaev6" ;; + 2-307) + UNAME_MACHINE="alphaev67" + ;; esac objdump --private-headers $dummy | \ *************** *** 834,842 **** elif test "${UNAME_MACHINE}" = "mips" ; then cat >$dummy.c <$dummy.c < /* for printf() prototype */ ! int main (int argc, char *argv[]) { #else ! int main (argc, argv) int argc; char *argv[]; { #endif #ifdef __MIPSEB__ printf ("%s-unknown-linux-gnu\n", argv[1]); *************** *** 849,854 **** --- 818,825 ---- EOF $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 rm -f $dummy.c $dummy + elif test "${UNAME_MACHINE}" = "s390"; then + echo s390-ibm-linux && exit 0 else # Either a pre-BFD a.out linker (linux-gnuoldld) # or one that does not give us useful --help. *************** *** 870,875 **** --- 841,847 ---- cat >$dummy.c < #ifdef __cplusplus + #include /* for printf() prototype */ int main (int argc, char *argv[]) { #else int main (argc, argv) int argc; char *argv[]; { *************** *** 890,896 **** return 0; } EOF ! ${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 rm -f $dummy.c $dummy fi ;; # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions --- 862,868 ---- return 0; } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 rm -f $dummy.c $dummy fi ;; # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions *************** *** 898,931 **** i?86:DYNIX/ptx:4*:*) echo i386-sequent-sysv4 exit 0 ;; - # added by chet for bash based on usenet posting from and - # documentation on SCO's web site -- UnixWare 7 (SVR5) - # i?86:UnixWare:5*:*) - # echo ${UNAME_MACHINE}-pc-sysv5uw${UNAME_VERSION} - # exit 0 ;; i?86:UNIX_SV:4.2MP:2.*) ! # Unixware is an offshoot of SVR4, but it has its own version ! # number series starting with 2... ! # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. ! # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; ! i?86:*:4.*:* | i?86:SYSTEM_V:4.*:* | i?86:UNIX_SV:4.*:*) if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then ! echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE} else ! 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 ! (/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686 ! (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585 ! 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' /dev/null 2>/dev/null; then ! echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} else ! echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi exit 0 ;; i?86:*:5:7*) ! # Fixed at (any) Pentium or better ! UNAME_MACHINE=i586 ! if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then ! echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION} ! else ! echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} ! fi ! exit 0 ;; i?86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null | /bin/grep entium >/dev/null \ && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) ! /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ! && echo i486-ncr-sysv4 && exit 0 ;; ! mc68030:UNIX_System_V:4.*:*) ! echo m68k-atari-sysv4 ! exit 0 ;; m68*:LynxOS:2.*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit 0 ;; i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*) ! echo i386-pc-lynxos${UNAME_RELEASE} exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} --- 950,965 ---- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) ! /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ! && echo i486-ncr-sysv4 && exit 0 ;; m68*:LynxOS:2.*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit 0 ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit 0 ;; i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*) ! echo i386-unknown-lynxos${UNAME_RELEASE} exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} *************** *** 994,1006 **** rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit 0 ;; - *:LynxOS:*:*) - echo ${UNAME_MACHINE}-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} exit 0 ;; ! RM*:SINIX-*:*:* | RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 exit 0 ;; *:SINIX-*:*:*) --- 967,979 ---- rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit 0 ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} + exit 0 ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 exit 0 ;; ! RM*:SINIX-*:*:*) echo mips-sni-sysv4 exit 0 ;; *:SINIX-*:*:*) *************** *** 1012,1020 **** fi exit 0 ;; PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ! # says ! echo i586-unisys-sysv4 ! exit 0 ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm --- 985,993 ---- fi exit 0 ;; PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ! # says ! echo i586-unisys-sysv4 ! exit 0 ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm *************** *** 1023,1049 **** *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 ! exit 0 ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} exit 0 ;; news*:NEWS-OS:*:6*) echo mips-sony-newsos6 exit 0 ;; ! R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then ! echo mips-nec-sysv${UNAME_RELEASE} else ! echo mips-unknown-sysv${UNAME_RELEASE} fi ! exit 0 ;; ! BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. ! echo powerpc-apple-beos exit 0 ;; ! BeMac:BeOS:*:*) echo powerpc-apple-beos exit 0 ;; ! BePC:BeOS:*:*) echo i586-pc-beos exit 0 ;; SX-4:SUPER-UX:*:*) --- 996,1022 ---- *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 ! exit 0 ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} exit 0 ;; news*:NEWS-OS:*:6*) echo mips-sony-newsos6 exit 0 ;; ! R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then ! echo mips-nec-sysv${UNAME_RELEASE} else ! 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 ;; ! BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit 0 ;; SX-4:SUPER-UX:*:*) *************** *** 1058,1063 **** --- 1031,1057 ---- *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; + *:Darwin:*:*) + echo `uname -p`-apple-darwin${UNAME_RELEASE} + exit 0 ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + if test "${UNAME_MACHINE}" = "x86pc"; then + UNAME_MACHINE=pc + fi + echo `uname -p`-${UNAME_MACHINE}-nto-qnx + exit 0 ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit 0 ;; + NSR-W:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit 0 ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit 0 ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 *************** *** 1088,1098 **** #endif #if defined (__arm) && defined (__acorn) && defined (__unix) ! printf ("arm-acorn-riscix\n"); exit (0); ! #endif ! ! #if defined (hp9000) && !defined (hpux) ! printf ("m68k-hp-bsd\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) --- 1082,1088 ---- #endif #if defined (__arm) && defined (__acorn) && defined (__unix) ! printf ("arm-acorn-riscix"); exit (0); #endif #if defined (hp300) && !defined (hpux) *************** *** 1164,1281 **** printf ("i860-alliant-bsd\n"); exit (0); #endif - /* Begin cases added for Bash */ - #if defined (tahoe) - printf ("tahoe-cci-bsd\n"); exit (0); - #endif - - #if defined (nec_ews) - # if defined (SYSTYPE_SYSV) - printf ("ews4800-nec-sysv4\n"); exit 0; - # else - printf ("ews4800-nec-bsd\n"); exit (0); - # endif - #endif - - #if defined (sony) - # if defined (SYSTYPE_SYSV) - printf ("mips-sony-sysv4\n"); exit 0; - # else - printf ("mips-sony-bsd\n"); exit (0); - # endif - #endif - - #if defined (ardent) - printf ("titan-ardent-bsd\n"); exit (0); - #endif - - #if defined (stardent) - printf ("stardent-stardent-sysv\n"); exit (0); - #endif - - #if defined (ibm032) - printf ("ibmrt-ibm-bsd4.3\n"); exit (0); - #endif - - #if defined (sequent) && defined (i386) - printf ("i386-sequent-bsd\n"); exit (0); - #endif - - #if defined (qnx) && defined (i386) - printf ("i386-pc-qnx\n"); exit (0); - #endif - - #if defined (gould) - printf ("gould-gould-bsd\n"); exit (0); - #endif - - #if defined (unixpc) - printf ("unixpc-att-sysv\n"); exit (0); - #endif - - #if defined (att386) - printf ("i386-att-sysv3\n"); exit (0); - #endif - - #if defined (__m88k) && defined (__UMAXV__) - printf ("m88k-encore-sysv3\n"); exit (0); - #endif - - #if defined (drs6000) - printf ("drs6000-icl-sysv4.2\n"); exit (0); - #endif - - #if defined (clipper) - printf ("clipper-orion-bsd\n"); exit (0); - #endif - - #if defined (is68k) - printf ("m68k-isi-bsd\n"); exit (0); - #endif - - #if defined (luna88k) - printf ("luna88k-omron-bsd\n"); exit (0); - #endif - - #if defined (butterfly) && defined (BFLY1) - printf ("butterfly-bbn-mach\n"); exit (0); - #endif - - #if defined (tower32) - printf ("tower32-ncr-sysv4\n"); exit (0); - #endif - - #if defined (MagicStation) - printf ("magicstation-unknown-bsd\n"); exit (0); - #endif - - #if defined (scs) - printf ("symmetric-scs-bsd4.2\n"); exit (0); - #endif - - #if defined (tandem) - printf ("tandem-tandem-sysv\n"); exit (0); - #endif - - #if defined (cadmus) - printf ("cadmus-pcs-sysv\n"); exit (0); - #endif - - #if defined (masscomp) - printf ("masscomp-masscomp-sysv3\n"); exit (0); - #endif - - #if defined (hbullx20) - printf ("hbullx20-bull-sysv3\n"); exit (0); - #endif - - /* End cases added for Bash */ - exit (1); } EOF ! ${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0 rm -f $dummy.c $dummy # Apollos put the system type in the environment. --- 1154,1164 ---- printf ("i860-alliant-bsd\n"); exit (0); #endif exit (1); } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0 rm -f $dummy.c $dummy # Apollos put the system type in the environment. *************** *** 1307,1327 **** exit 0 ;; esac fi - - # Begin cases added for Bash - case "$UNAME" in - uts) echo uts-amdahl-sysv${UNAME_RELEASE}; exit 0 ;; - esac - - if [ -d /usr/amiga ]; then - echo m68k-cbm-sysv${UNAME_RELEASE}; exit 0; - fi - - if [ -f /bin/fxc.info ]; then - echo fxc-alliant-concentrix - exit 0 - fi - # end cases added for Bash #echo '(Unable to guess system type)' 1>&2 --- 1190,1195 ---- Index: readline-4.1/support/config.sub diff -c readline-4.1/support/config.sub:1.1.1.1 readline-4.1/support/config.sub:1.2 *** readline-4.1/support/config.sub:1.1.1.1 Wed Mar 21 23:50:15 2001 --- readline-4.1/support/config.sub Wed Mar 21 23:52:07 2001 *************** *** 1,6 **** #! /bin/sh # Configuration validation subroutine script, version 1.1. ! # Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc. # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. --- 1,8 ---- #! /bin/sh # Configuration validation subroutine script, version 1.1. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 ! # Free Software Foundation, Inc. ! # # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. *************** *** 25,30 **** --- 27,35 ---- # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Written by Per Bothner . + # Please send patches to . + # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. *************** *** 68,74 **** # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! linux-gnu*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; --- 73,79 ---- # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; *************** *** 94,100 **** -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ ! -apple ) os= basic_machine=$1 ;; --- 99,105 ---- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ ! -apple) os= basic_machine=$1 ;; *************** *** 105,111 **** -scout) ;; -wrs) ! os=vxworks basic_machine=$1 ;; -hiux*) --- 110,116 ---- -scout) ;; -wrs) ! os=-vxworks basic_machine=$1 ;; -hiux*) *************** *** 156,161 **** --- 161,170 ---- -psos*) os=-psos ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; esac # Decode aliases for certain CPU-COMPANY combinations. *************** *** 165,182 **** tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ | 580 | i960 | h8300 \ | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ ! | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \ | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ | mips64orion | mips64orionel | mipstx39 | mipstx39el \ | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ | mips64vr5000 | miprs64vr5000el | mcore \ | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ ! | thumb | d10v) basic_machine=$basic_machine-unknown ;; ! m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65) ;; # We use `pc' rather than `unknown' --- 174,194 ---- tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ | 580 | i960 | h8300 \ + | x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \ | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ ! | hppa64 \ ! | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ ! | alphaev6[78] \ | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ | mips64orion | mips64orionel | mipstx39 | mipstx39el \ | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ | mips64vr5000 | miprs64vr5000el | mcore \ | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ ! | thumb | d10v | fr30 | avr) basic_machine=$basic_machine-unknown ;; ! m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl) ;; # We use `pc' rather than `unknown' *************** *** 197,204 **** | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ | xmp-* | ymp-* \ ! | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \ ! | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \ | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ | clipper-* | orion-* \ | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ --- 209,219 ---- | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ | xmp-* | ymp-* \ ! | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \ ! | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ ! | hppa2.0n-* | hppa64-* \ ! | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ ! | alphaev6[78]-* \ | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ | clipper-* | orion-* \ | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ *************** *** 206,223 **** | mips64el-* | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ | mipstx39-* | mipstx39el-* | mcore-* \ ! | f301-* | armv*-* | t3e-* \ | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ ! | thumb-* | v850-* | d30v-* | tic30-* | c30-* ) ;; - # BEGIN cases added for Bash - butterfly-bbn* | cadmus-* | ews*-nec | ibmrt-ibm* | masscomp-masscomp \ - | tandem-* | symmetric-* | drs6000-icl | *-*ardent | gould-gould \ - | concurrent-* | ksr1-* | esa-ibm | fxc-alliant | *370-amdahl \ - | *-convex | sx[45]*-nec ) - ;; - # END cases added for Bash - # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) --- 221,231 ---- | mips64el-* | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ | mipstx39-* | mipstx39el-* | mcore-* \ ! | f301-* | armv*-* | s390-* | sv1-* | t3e-* \ | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ ! | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \ ! | bs2000-*) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) *************** *** 253,260 **** os=-sysv ;; amiga | amiga-*) ! # basic_machine=m68k-cbm ! basic_machine=m68k-unknown ;; amigaos | amigados) basic_machine=m68k-cbm --- 261,267 ---- os=-sysv ;; amiga | amiga-*) ! basic_machine=m68k-cbm ;; amigaos | amigados) basic_machine=m68k-cbm *************** *** 337,345 **** basic_machine=m68k-bull os=-sysv3 ;; - hbullx20-bull) - basic_machine=m68k-bull - ;; ebmon29k) basic_machine=a29k-amd os=-ebmon --- 344,349 ---- *************** *** 348,354 **** basic_machine=elxsi-elxsi os=-bsd ;; ! encore | umax | mmax | multimax) basic_machine=ns32k-encore ;; es1800 | OSE68k | ose68k | ose | OSE) --- 352,358 ---- basic_machine=elxsi-elxsi os=-bsd ;; ! encore | umax | mmax) basic_machine=ns32k-encore ;; es1800 | OSE68k | ose68k | ose | OSE) *************** *** 436,447 **** basic_machine=hppa1.1-hp os=-proelf ;; ! ibm032-*) ! basic_machine=ibmrt-ibm ;; i370-ibm* | ibm*) basic_machine=i370-ibm - os=-mvs ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? i[34567]86v32) --- 440,450 ---- basic_machine=hppa1.1-hp os=-proelf ;; ! ia64*) ! basic_machine=ia64-intel ;; i370-ibm* | ibm*) basic_machine=i370-ibm ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? i[34567]86v32) *************** *** 490,501 **** basic_machine=m68k-isi os=-sysv ;; ! luna88k-omron* | m88k-omron*) basic_machine=m88k-omron ;; - magicstation*) - basic_machine=magicstation-unknown - ;; magnum | m3230) basic_machine=mips-mips os=-sysv --- 493,501 ---- basic_machine=m68k-isi os=-sysv ;; ! m88k-omron*) basic_machine=m88k-omron ;; magnum | m3230) basic_machine=mips-mips os=-sysv *************** *** 507,513 **** miniframe) basic_machine=m68000-convergent ;; ! *mint | *MiNT) basic_machine=m68k-atari os=-mint ;; --- 507,513 ---- miniframe) basic_machine=m68000-convergent ;; ! *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) basic_machine=m68k-atari os=-mint ;; *************** *** 525,530 **** --- 525,534 ---- mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; + mmix*) + basic_machine=mmix-knuth + os=-mmixware + ;; monitor) basic_machine=m68k-rom68k os=-coff *************** *** 533,538 **** --- 537,546 ---- basic_machine=i386-unknown os=-msdos ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 *************** *** 542,548 **** os=-netbsd ;; netwinder) ! basic_machine=armv4l-corel os=-linux ;; news | news700 | news800 | news900) --- 550,556 ---- os=-netbsd ;; netwinder) ! basic_machine=armv4l-rebel os=-linux ;; news | news700 | news800 | news900) *************** *** 557,566 **** basic_machine=mips-sony os=-newsos ;; ! necv70) ! basic_machine=v70-nec ! os=-sysv ! ;; next | m*-next ) basic_machine=m68k-next case $os in --- 565,574 ---- basic_machine=mips-sony os=-newsos ;; ! necv70) ! basic_machine=v70-nec ! os=-sysv ! ;; next | m*-next ) basic_machine=m68k-next case $os in *************** *** 585,618 **** nindy960) basic_machine=i960-intel os=-nindy ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; np1) basic_machine=np1-gould ;; ! osr5 | sco5) # SCO Open Server ! basic_machine=i386-pc ! os=-sco3.2v5 ;; ! odt | odt3 | odt4) # SCO Open Desktop ! basic_machine=i386-pc ! os=-sco3.2v4 ;; ! op50n-* | op60c-*) ! basic_machine=hppa1.1-oki ! os=-proelf ! ;; ! OSE68000 | ose68000) ! basic_machine=m68000-ericsson ! os=-ose ! ;; ! os68k) ! basic_machine=m68k-none ! os=-os68k ! ;; pa-hitachi) basic_machine=hppa1.1-hitachi os=-hiuxwe2 --- 593,621 ---- nindy960) basic_machine=i960-intel os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 ;; np1) basic_machine=np1-gould ;; ! nsr-tandem) ! basic_machine=nsr-tandem ;; ! op50n-* | op60c-*) ! basic_machine=hppa1.1-oki ! os=-proelf ;; ! OSE68000 | ose68000) ! basic_machine=m68000-ericsson ! os=-ose ! ;; ! os68k) ! basic_machine=m68k-none ! os=-os68k ! ;; pa-hitachi) basic_machine=hppa1.1-hitachi os=-hiuxwe2 *************** *** 627,648 **** pbb) basic_machine=m68k-tti ;; ! pc532 | pc532-*) basic_machine=ns32k-pc532 ;; pentium | p5 | k5 | k6 | nexen) ! basic_machine=i586-intel ;; - pentiumpro | p6 | 6x86) - basic_machine=i686-pc - ;; pentiumii | pentium2) basic_machine=i786-pc ;; pentium-* | p5-* | k5-* | k6-* | nexen-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ! pentiumpro-* | p6-* | 6x86*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-*) --- 630,651 ---- pbb) basic_machine=m68k-tti ;; ! pc532 | pc532-*) basic_machine=ns32k-pc532 ;; pentium | p5 | k5 | k6 | nexen) ! basic_machine=i586-pc ! ;; ! pentiumpro | p6 | 6x86) ! basic_machine=i686-pc ;; pentiumii | pentium2) basic_machine=i786-pc ;; pentium-* | p5-* | k5-* | k6-* | nexen-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ! pentiumpro-* | p6-* | 6x86-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-*) *************** *** 654,710 **** power) basic_machine=rs6000-ibm ;; ppc) basic_machine=powerpc-unknown ! ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown ! ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ps2) basic_machine=i386-ibm ;; ! rom68k) ! basic_machine=m68k-rom68k ! os=-coff ! ;; rm[46]00) basic_machine=mips-siemens ;; rtpc | rtpc-*) basic_machine=romp-ibm ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; sequent) basic_machine=i386-sequent ;; sh) basic_machine=sh-hitachi os=-hms ;; - sparclite-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; sps7) basic_machine=m68k-bull os=-sysv2 ;; spur) basic_machine=spur-unknown ;; ! st2000) ! basic_machine=m68k-tandem ! ;; ! stratus) ! basic_machine=i860-stratus ! os=-sysv4 ! ;; sun2) basic_machine=m68000-sun ;; --- 657,713 ---- power) basic_machine=rs6000-ibm ;; ppc) basic_machine=powerpc-unknown ! ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown ! ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ps2) basic_machine=i386-ibm ;; ! rom68k) ! basic_machine=m68k-rom68k ! os=-coff ! ;; rm[46]00) basic_machine=mips-siemens ;; rtpc | rtpc-*) basic_machine=romp-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi ;; sequent) basic_machine=i386-sequent ;; sh) basic_machine=sh-hitachi os=-hms + ;; + sparclite-wrs) + basic_machine=sparclite-wrs + os=-vxworks ;; sps7) basic_machine=m68k-bull os=-sysv2 ;; spur) basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem ;; ! stratus) ! basic_machine=i860-stratus ! os=-sysv4 ! ;; sun2) basic_machine=m68000-sun ;; *************** *** 745,764 **** sun386 | sun386i | roadrunner) basic_machine=i386-sun ;; symmetry) basic_machine=i386-sequent os=-dynix ;; ! t3e) ! basic_machine=t3e-cray ! os=-unicos ! ;; ! tx39) ! basic_machine=mipstx39-unknown ! ;; ! tx39el) ! basic_machine=mipstx39el-unknown ! ;; tower | tower-32) basic_machine=m68k-ncr ;; --- 748,771 ---- sun386 | sun386i | roadrunner) basic_machine=i386-sun ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; symmetry) basic_machine=i386-sequent os=-dynix + ;; + t3e) + basic_machine=t3e-cray + os=-unicos + ;; + tx39) + basic_machine=mipstx39-unknown ;; ! tx39el) ! basic_machine=mipstx39el-unknown ! ;; tower | tower-32) basic_machine=m68k-ncr ;; *************** *** 769,787 **** ultra3) basic_machine=a29k-nyu os=-sym1 ;; - uw2 | unixware | unixware2) - basic_machine=i386-pc - os=-sysv4.2uw2.1 - ;; - uw7 | unixware7) - basic_machine=i386-pc - os=-sysv5uw7 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; vaxv) basic_machine=vax-dec os=-sysv --- 776,786 ---- ultra3) basic_machine=a29k-nyu os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none ;; vaxv) basic_machine=vax-dec os=-sysv *************** *** 791,798 **** os=-vms ;; vpp*|vx|vx-*) ! basic_machine=f301-fujitsu ! ;; vxworks960) basic_machine=i960-wrs os=-vxworks --- 790,797 ---- os=-vms ;; vpp*|vx|vx-*) ! basic_machine=f301-fujitsu ! ;; vxworks960) basic_machine=i960-wrs os=-vxworks *************** *** 804,829 **** vxworks29k) basic_machine=a29k-wrs os=-vxworks ;; ! w65*) ! basic_machine=w65-wdc ! os=-none ! ;; ! w89k-*) ! basic_machine=hppa1.1-winbond ! os=-proelf ! ;; xmp) basic_machine=xmp-cray os=-unicos ;; ! xps | xps100) basic_machine=xps100-honeywell ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; none) basic_machine=none-none os=-none --- 803,828 ---- vxworks29k) basic_machine=a29k-wrs os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none ;; ! w89k-*) ! basic_machine=hppa1.1-winbond ! os=-proelf ! ;; xmp) basic_machine=xmp-cray os=-unicos ;; ! xps | xps100) basic_machine=xps100-honeywell + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim ;; none) basic_machine=none-none os=-none *************** *** 831,847 **** # Here we handle the default manufacturer of certain CPU types. It is in # some cases the only manufacturer, in others, it is the most popular. ! w89k) ! basic_machine=hppa1.1-winbond ! ;; ! op50n) ! basic_machine=hppa1.1-oki ! ;; ! op60c) ! basic_machine=hppa1.1-oki ! ;; mips) ! if test "x$os" = "x-linux-gnu" ; then basic_machine=mips-unknown else basic_machine=mips-mips --- 830,846 ---- # Here we handle the default manufacturer of certain CPU types. It is in # some cases the only manufacturer, in others, it is the most popular. ! w89k) ! basic_machine=hppa1.1-winbond ! ;; ! op50n) ! basic_machine=hppa1.1-oki ! ;; ! op60c) ! basic_machine=hppa1.1-oki ! ;; mips) ! if [ x$os = x-linux-gnu ]; then basic_machine=mips-unknown else basic_machine=mips-mips *************** *** 865,871 **** sparc | sparcv9) basic_machine=sparc-sun ;; ! cydra) basic_machine=cydra-cydrome ;; orion) --- 864,870 ---- sparc | sparcv9) basic_machine=sparc-sun ;; ! cydra) basic_machine=cydra-cydrome ;; orion) *************** *** 873,889 **** ;; orion105) basic_machine=clipper-highlevel ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - c4x*) - basic_machine=c4x-none - os=-coff - ;; *) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 exit 1 --- 872,888 ---- ;; orion105) basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + c4x*) + basic_machine=c4x-none + os=-coff ;; *) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 exit 1 *************** *** 907,914 **** if [ x"$os" != x"" ] then case $os in ! # First match some system type aliases ! # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` --- 906,913 ---- if [ x"$os" != x"" ] then case $os in ! # First match some system type aliases ! # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` *************** *** 919,933 **** -svr4*) os=-sysv4 ;; ! -unixware | -uw | -unixware2* | -uw2*) ! os=-sysv4.2uw2.1 ;; - -unixware7* | -uw7*) - os=-sysv5uw7 - ;; - -unixware*) - os=-sysv4.2uw - ;; -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; --- 918,926 ---- -svr4*) os=-sysv4 ;; ! -unixware*) ! os=-sysv4.2uw ;; -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; *************** *** 946,968 **** | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ! | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ ! | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*) # Remember, each alternative MUST END IN *, to match a version number. ;; ! # BEGIN CASES ADDED FOR Bash ! -qnx* | -powerux* | -superux* ) ;; ! # END CASES ADDED FOR Bash ! -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ ! | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ ! | -macos* | -mpw* | -magic* | -mon960* | -lnews*) ! ;; ! -mac*) ! os=`echo $os | sed -e 's|mac|macos|'` ! ;; ! -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; --- 939,969 ---- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ! | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ ! | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ ! | -openstep* | -oskit*) # Remember, each alternative MUST END IN *, to match a version number. ;; ! -qnx*) ! case $basic_machine in ! x86-* | i[34567]86-*) ! ;; ! *) ! os=-nto$os ! ;; ! esac ;; ! -nto*) ! os=-nto-qnx ! ;; ! -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ ! | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ ! | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ! ;; ! -mac*) ! os=`echo $os | sed -e 's|mac|macos|'` ! ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; *************** *** 972,977 **** --- 973,984 ---- -sunos6*) os=`echo $os | sed -e 's|sunos6|solaris3|'` ;; + -opened*) + os=-openedition + ;; + -wince*) + os=-wince + ;; -osfrose*) os=-osfrose ;; *************** *** 986,1001 **** ;; -acis*) os=-aos ;; - -386bsd) - os=-bsd - ;; -ctix* | -uts*) os=-sysv ;; -ns2 ) ! os=-nextstep2 ;; # Preserve the version number of sinix5. -sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` --- 993,1011 ---- ;; -acis*) os=-aos + ;; + -386bsd) + os=-bsd ;; -ctix* | -uts*) os=-sysv ;; -ns2 ) ! os=-nextstep2 ;; + -nsk) + os=-nsk + ;; # Preserve the version number of sinix5. -sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` *************** *** 1017,1041 **** ;; -sysvr4) os=-sysv4 - ;; - -sysvr5) - os=-sysv5 ;; ! # This must come after -sysvr[45]. -sysv*) ;; ! -ose*) ! os=-ose ! ;; ! -es1800*) ! os=-ose ! ;; -xenix) os=-xenix ;; -*mint | -*MiNT) ! os=-mint ! ;; -none) ;; *) --- 1027,1048 ---- ;; -sysvr4) os=-sysv4 ;; ! # This must come after -sysvr4. -sysv*) + ;; + -ose*) + os=-ose ;; ! -es1800*) ! os=-ose ! ;; -xenix) os=-xenix ;; -*mint | -*MiNT) ! os=-mint ! ;; -none) ;; *) *************** *** 1061,1070 **** *-acorn) os=-riscix1.2 ;; arm*-semi) os=-aout ;; ! pdp11-*) os=-none ;; *-dec | vax-*) --- 1068,1080 ---- *-acorn) os=-riscix1.2 ;; + arm*-rebel) + os=-linux + ;; arm*-semi) os=-aout ;; ! pdp11-*) os=-none ;; *-dec | vax-*) *************** *** 1081,1096 **** # This also exists in the configure program, but was not the # default. # os=-sunos4 ;; ! m68*-cisco) ! os=-aout ! ;; ! mips*-cisco) ! os=-elf ! ;; ! mips*-*) ! os=-elf ! ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; --- 1091,1106 ---- # This also exists in the configure program, but was not the # default. # os=-sunos4 + ;; + m68*-cisco) + os=-aout ;; ! mips*-cisco) ! os=-elf ! ;; ! mips*-*) ! os=-elf ! ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; *************** *** 1102,1117 **** ;; *-ibm) os=-aix ;; ! *-wec) ! os=-proelf ! ;; ! *-winbond) ! os=-proelf ! ;; ! *-oki) ! os=-proelf ! ;; *-hp) os=-hpux ;; --- 1112,1127 ---- ;; *-ibm) os=-aix + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf ;; ! *-oki) ! os=-proelf ! ;; *-hp) os=-hpux ;; *************** *** 1154,1172 **** *-next) os=-nextstep3 ;; ! *-gould) os=-sysv ;; ! *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; ! *-sgi) os=-irix ;; ! *-siemens) os=-sysv4 ;; *-masscomp) --- 1164,1182 ---- *-next) os=-nextstep3 ;; ! *-gould) os=-sysv ;; ! *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; ! *-sgi) os=-irix ;; ! *-siemens) os=-sysv4 ;; *-masscomp) *************** *** 1174,1192 **** ;; f301-fujitsu) os=-uxpv ;; ! *-rom68k) ! os=-coff ! ;; ! *-*bug) ! os=-coff ! ;; ! *-apple) ! os=-macos ! ;; ! *-atari*) ! os=-mint ! ;; *) os=-none ;; --- 1184,1202 ---- ;; f301-fujitsu) os=-uxpv + ;; + *-rom68k) + os=-coff ;; ! *-*bug) ! os=-coff ! ;; ! *-apple) ! os=-macos ! ;; ! *-atari*) ! os=-mint ! ;; *) os=-none ;; *************** *** 1205,1222 **** -sunos*) vendor=sun ;; - -lynxos*) - vendor=lynx - ;; -aix*) vendor=ibm ;; - -beos*) - vendor=be - ;; -hpux*) vendor=hp ;; -hiux*) vendor=hitachi ;; --- 1215,1232 ---- -sunos*) vendor=sun ;; -aix*) vendor=ibm + ;; + -beos*) + vendor=be ;; -hpux*) vendor=hp ;; + -mpeix*) + vendor=hp + ;; -hiux*) vendor=hitachi ;; *************** *** 1232,1238 **** -genix*) vendor=ns ;; ! -mvs*) vendor=ibm ;; -ptx*) --- 1242,1248 ---- -genix*) vendor=ns ;; ! -mvs* | -opened*) vendor=ibm ;; -ptx*) *************** *** 1243,1258 **** ;; -aux*) vendor=apple ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -*MiNT) - vendor=atari - ;; esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; --- 1253,1268 ---- ;; -aux*) vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -*MiNT) + vendor=atari ;; esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; Index: readline-4.1/support/shlib-install diff -c readline-4.1/support/shlib-install:1.1.1.1 readline-4.1/support/shlib-install:1.3 *** readline-4.1/support/shlib-install:1.1.1.1 Wed Mar 21 23:50:16 2001 --- readline-4.1/support/shlib-install Thu Mar 22 07:58:32 2001 *************** *** 102,112 **** fi ;; ! solaris2*|aix4.[2-9]*|osf*|irix[56]*) # libname.so -> libname.so.M ${echo} ${RM} ${INSTALLDIR}/$LINK1 if [ -z "$uninstall" ]; then ! ${echo} ln -s $INSTALLDIR/$LIBNAME ${INSTALLDIR}/$LINK1 fi ;; --- 102,113 ---- fi ;; ! solaris2*|aix4.[2-9]*|aix5*|osf*|irix[56]*) # libname.so -> libname.so.M ${echo} ${RM} ${INSTALLDIR}/$LINK1 if [ -z "$uninstall" ]; then ! (cd ${INSTALLDIR} ! ${echo} ln -s $LIBNAME $LINK1) fi ;; Index: readline-4.1/support/shobj-conf diff -c readline-4.1/support/shobj-conf:1.1.1.1 readline-4.1/support/shobj-conf:1.2 *** readline-4.1/support/shobj-conf:1.1.1.1 Wed Mar 21 23:50:16 2001 --- readline-4.1/support/shobj-conf Wed Mar 21 23:52:08 2001 *************** *** 178,185 **** SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' ;; ! aix4.[2-9]*-gcc*) # lightly tested by jik@cisco.com SHOBJ_CFLAGS=-fpic SHOBJ_LD='ld' SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall' SHOBJ_XLDFLAGS='-G' --- 178,195 ---- SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' ;; ! aix4.[2-9]*-gcc*|aix5*-gcc*) # lightly tested by jik@cisco.com ! case "${host_cpu}" in ! *ia64*) SHOBJ_CFLAGS=-fpic + SHOBJ_LD='${CC}' + SHOBJ_LDFLAGS='-shared -Wl,-Bexport -Wl,-h,$@' + + # SHLIB_XLDFLAGS='-R $(libdir)' + SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' + ;; + *) + SHOBJ_CFLAGS=-fpic SHOBJ_LD='ld' SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall' SHOBJ_XLDFLAGS='-G' *************** *** 188,195 **** SHLIB_LIBS='-lcurses -lc' SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' ;; ! aix4.[2-9]*) SHOBJ_CFLAGS=-K SHOBJ_LD='ld' SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall' --- 198,217 ---- SHLIB_LIBS='-lcurses -lc' SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' ;; + esac;; ! aix4.[2-9]*|aix5*) ! case "${host_cpu}" in ! *ia64*) ! SHOBJ_CFLAGS=-fpic ! SHOBJ_LD='${CC}' ! SHOBJ_LDFLAGS='-G -Wl,-Bexport -Wl,-h,$@' ! # SHOBJ_XLDFLAGS='' ! ! # SHLIB_XLDFLAGS='-R $(libdir)' ! SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' ! ;; ! *) SHOBJ_CFLAGS=-K SHOBJ_LD='ld' SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall' *************** *** 199,204 **** --- 221,227 ---- SHLIB_LIBS='-lcurses -lc' SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' ;; + esac ;; # # THE FOLLOWING ARE UNTESTED -- and some may not support the dlopen interface