[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/config.sub
|
From: |
Paul Eggert |
|
Subject: |
[Emacs-diffs] Changes to emacs/config.sub |
|
Date: |
Mon, 27 May 2002 02:17:37 -0400 |
Index: emacs/config.sub
diff -c emacs/config.sub:1.153 emacs/config.sub:1.154
*** emacs/config.sub:1.153 Sun Mar 12 10:18:00 2000
--- emacs/config.sub Sat Nov 11 10:57:45 2000
***************
*** 2,8 ****
# 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.
--- 2,10 ----
# Configuration validation subroutine script, version 1.1.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
# Free Software Foundation, Inc.
!
! version='2000-11-10'
!
# 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.
***************
*** 27,33 ****
# 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 <address@hidden>.
# Please send patches to <address@hidden>.
#
# Configuration subroutine to validate and canonicalize a configuration type.
--- 29,34 ----
***************
*** 50,79 ****
# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
# It is wrong to echo any other type of specification.
! if [ x$1 = x ]
! then
! echo Configuration name missing. 1>&2
! echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
! echo "or $0 ALIAS" 1>&2
! echo where ALIAS is a recognized configuration type. 1>&2
! exit 1
! fi
! # First pass through any local machine types.
! case $1 in
! *local*)
! echo $1
! exit 0
! ;;
! *)
! ;;
esac
# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
# 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/'`
;;
--- 51,111 ----
# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
# It is wrong to echo any other type of specification.
! me=`echo "$0" | sed -e 's,.*/,,'`
! usage="\
! Usage: $0 [OPTION] CPU-MFR-OPSYS
! $0 [OPTION] ALIAS
!
! Canonicalize a configuration name.
!
! Operation modes:
! -h, --help print this help, then exit
! -V, --version print version number, then exit"
!
! help="
! Try \`$me --help' for more information."
!
! # Parse command line
! while test $# -gt 0 ; do
! case "$1" in
! --version | --vers* | -V )
! echo "$version" ; exit 0 ;;
! --help | --h* | -h )
! echo "$usage"; exit 0 ;;
! -- ) # Stop option processing
! shift; break ;;
! - ) # Use stdin as input.
! break ;;
! -* )
! exec >&2
! echo "$me: invalid option $1"
! echo "$help"
! exit 1 ;;
!
! *local*)
! # First pass through any local machine types.
! echo $1
! exit 0;;
!
! * )
! break ;;
! esac
! done
!
! case $# in
! 0) echo "$me: missing argument$help" >&2
! exit 1;;
! 1) ;;
! *) echo "$me: too many arguments$help" >&2
! exit 1;;
esac
# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
# 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* | storm-chaos*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\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
;;
--- 131,137 ----
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
! -apple | -axis)
os=
basic_machine=$1
;;
***************
*** 172,190 ****
# Recognize the basic CPU types without company name.
# Some are omitted here because they have special meanings below.
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-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)
;;
--- 204,230 ----
# Recognize the basic CPU types without company name.
# Some are omitted here because they have special meanings below.
tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
! | arme[lb] | armv[2345] | armv[345][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 | sh[34] \
! | 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 | d30v | fr30 | avr)
! basic_machine=$basic_machine-unknown
! ;;
! m6811 | m68hc11 | m6812 | m68hc12)
! # Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
+ os=-none
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 |
w65 | pj | pjl)
;;
***************
*** 192,198 ****
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
! i[34567]86)
basic_machine=$basic_machine-pc
;;
# Object if more than one company name word.
--- 232,238 ----
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
! i[234567]86 | x86_64)
basic_machine=$basic_machine-pc
;;
# Object if more than one company name word.
***************
*** 202,213 ****
;;
# Recognize the basic CPU types with company name.
# FIXME: clean up the formatting here.
! vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* |
m68000-* \
| m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
| 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-8]-* | alphaev56-* | alphapca5[67]-* \
| alphaev6[78]-* \
| we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
--- 242,255 ----
;;
# Recognize the basic CPU types with company name.
# FIXME: clean up the formatting here.
! vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* |
m68000-* \
| m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
| 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-* \
***************
*** 219,225 ****
| mipstx39-* | mipstx39el-* | mcore-* \
| f301-* | armv*-* | s390-* | sv1-* | t3e-* \
| m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* |
d10v-* \
! | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
--- 261,268 ----
| mipstx39-* | mipstx39el-* | mcore-* \
| f301-* | armv*-* | s390-* | sv1-* | t3e-* \
| m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* |
d10v-* \
! | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
! | bs2000-* | tic54x-* | c54x-* | x86_64-*)
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
***************
*** 256,269 ****
os=-sysv
;;
amiga | amiga-*)
! basic_machine=m68k-cbm
;;
amigaos | amigados)
! basic_machine=m68k-cbm
os=-amigaos
;;
amigaunix | amix)
! basic_machine=m68k-cbm
os=-sysv4
;;
apollo68)
--- 299,312 ----
os=-sysv
;;
amiga | amiga-*)
! basic_machine=m68k-unknown
;;
amigaos | amigados)
! basic_machine=m68k-unknown
os=-amigaos
;;
amigaunix | amix)
! basic_machine=m68k-unknown
os=-sysv4
;;
apollo68)
***************
*** 317,322 ****
--- 360,368 ----
crds | unos)
basic_machine=m68k-crds
;;
+ cris | cris-* | etrax*)
+ basic_machine=cris-axis
+ ;;
da30 | da30-*)
basic_machine=m68k-da30
;;
***************
*** 471,478 ****
basic_machine=i386-unknown
os=-mingw32
;;
! i386-qnx | qnx)
! basic_machine=i386-qnx
;;
iris | iris4d)
basic_machine=mips-sgi
--- 517,525 ----
basic_machine=i386-unknown
os=-mingw32
;;
! i[34567]86-pw32 | pw32)
! basic_machine=i586-unknown
! os=-pw32
;;
iris | iris4d)
basic_machine=mips-sgi
***************
*** 593,601 ****
--- 640,655 ----
basic_machine=i960-intel
os=-mon960
;;
+ nonstopux)
+ basic_machine=mips-compaq
+ os=-nonstopux
+ ;;
np1)
basic_machine=np1-gould
;;
+ nsr-tandem)
+ basic_machine=nsr-tandem
+ ;;
op50n-* | op60c-*)
basic_machine=hppa1.1-oki
os=-proelf
***************
*** 625,647 ****
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-*)
! basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pn)
basic_machine=pn-gould
--- 679,701 ----
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
! pentium | p5 | k5 | k6 | nexgen)
basic_machine=i586-pc
;;
! pentiumpro | p6 | 6x86 | athlon)
basic_machine=i686-pc
;;
pentiumii | pentium2)
! basic_machine=i686-pc
;;
! pentium-* | p5-* | k5-* | k6-* | nexgen-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
! pentiumpro-* | p6-* | 6x86-* | athlon-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentiumii-* | pentium2-*)
! basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pn)
basic_machine=pn-gould
***************
*** 752,757 ****
--- 806,815 ----
basic_machine=t3e-cray
os=-unicos
;;
+ tic54x | c54x*)
+ basic_machine=tic54x-unknown
+ os=-coff
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
***************
*** 853,858 ****
--- 911,919 ----
we32k)
basic_machine=we32k-att
;;
+ sh3 | sh4)
+ basic_machine=sh-unknown
+ ;;
sparc | sparcv9)
basic_machine=sparc-sun
;;
***************
*** 933,941 ****
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
! | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* |
-oskit*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
--- 994,1015 ----
| -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* | -conix* | -pw32* | -nonstopux* |
-storm-chaos*)
# 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*)
***************
*** 982,987 ****
--- 1056,1064 ----
-ns2 )
os=-nextstep2
;;
+ -nsk*)
+ os=-nsk
+ ;;
# Preserve the version number of sinix5.
-sinix5.*)
os=`echo $os | sed -e 's|sinix|sysv|'`
***************
*** 995,1003 ****
-oss*)
os=-sysv3
;;
- -qnx)
- os=-qnx4
- ;;
-svr4)
os=-sysv4
;;
--- 1072,1077 ----
***************
*** 1022,1030 ****
-*mint | -*MiNT)
os=-mint
;;
- -neutrino* | -nto*)
- os=-neutrino
- ;;
-none)
;;
*)
--- 1096,1101 ----
***************
*** 1245,1256 ****
-*mint | -*MiNT)
vendor=atari
;;
- -neutrino* | -nto*)
- vendor=qnx
- ;;
esac
basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
;;
esac
echo $basic_machine$os
--- 1316,1332 ----
-*mint | -*MiNT)
vendor=atari
;;
esac
basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
;;
esac
echo $basic_machine$os
+ exit 0
+
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "version='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
+ # End:
- [Emacs-diffs] Changes to emacs/config.sub,
Paul Eggert <=