[Emacs-diffs] Changes to emacs/config.sub

[Juanma Barranquero]

Index: emacs/config.sub
diff -c emacs/config.sub:1.155 emacs/config.sub:1.156
*** emacs/config.sub:1.155      Mon May 27 02:43:19 2002
--- emacs/config.sub    Fri Nov 22 06:28:27 2002
***************
*** 3,9 ****
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  #   2000, 2001, 2002 Free Software Foundation, Inc.
  
! timestamp='2002-05-22'
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
--- 3,9 ----
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  #   2000, 2001, 2002 Free Software Foundation, Inc.
  
! timestamp='2002-11-13'
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
***************
*** 118,124 ****
  # 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* | os2-emx* | windows32-* | rtmk-nova*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
      ;;
--- 118,124 ----
  # 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* | freebsd*-gnu* | storm-chaos* | os2-emx* | 
windows32-* | rtmk-nova*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
      ;;
***************
*** 229,252 ****
        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | 
alpha64pca5[67] \
        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
!       | c4x | clipper \
!       | d10v | d30v | dsp16xx \
!       | fr30 \
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
        | i370 | i860 | i960 | ia64 \
        | m32r | m68000 | m68k | m88k | mcore \
!       | mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
!       | mips64vr4100 | mips64vr4100el | mips64vr4300 \
!       | mips64vr4300el | mips64vr5000 | mips64vr5000el \
!       | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
!       | mipsisa32 | mipsisa64 \
        | mn10200 | mn10300 \
        | ns16k | ns32k \
        | openrisc | or32 \
        | pdp10 | pdp11 | pj | pjl \
        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
        | pyramid \
!       | sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
        | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | 
sparcv9b \
        | strongarm \
        | tahoe | thumb | tic80 | tron \
--- 229,262 ----
        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | 
alpha64pca5[67] \
        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
!       | clipper \
!       | d10v | d30v | dlx | dsp16xx \
!       | fr30 | frv \
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
        | i370 | i860 | i960 | ia64 \
+       | ip2k \
        | m32r | m68000 | m68k | m88k | mcore \
!       | mips | mipsbe | mipseb | mipsel | mipsle \
!       | mips16 \
!       | mips64 | mips64el \
!       | mips64vr | mips64vrel \
!       | mips64orion | mips64orionel \
!       | mips64vr4100 | mips64vr4100el \
!       | mips64vr4300 | mips64vr4300el \
!       | mips64vr5000 | mips64vr5000el \
!       | mipsisa32 | mipsisa32el \
!       | mipsisa64 | mipsisa64el \
!       | mipsisa64sb1 | mipsisa64sb1el \
!       | mipsisa64sr71k | mipsisa64sr71kel \
!       | mipstx39 | mipstx39el \
        | mn10200 | mn10300 \
        | ns16k | ns32k \
        | openrisc | or32 \
        | pdp10 | pdp11 | pj | pjl \
        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
        | pyramid \
!       | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
!       | sh64 | sh64le \
        | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | 
sparcv9b \
        | strongarm \
        | tahoe | thumb | tic80 | tron \
***************
*** 284,314 ****
        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
        | avr-* \
        | bs2000-* \
!       | c[123]* | c30-* | [cjt]90-* | c54x-* \
        | clipper-* | cydra-* \
!       | d10v-* | d30v-* \
        | elxsi-* \
!       | f30[01]-* | f700-* | fr30-* | fx80-* \
        | h8300-* | h8500-* \
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
        | i*86-* | i860-* | i960-* | ia64-* \
        | m32r-* \
        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
        | m88110-* | m88k-* | mcore-* \
!       | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
!       | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
!       | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
!       | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
        | none-* | np1-* | ns16k-* | ns32k-* \
        | orion-* \
        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
        | pyramid-* \
        | romp-* | rs6000-* \
!       | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
        | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
        | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
!       | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
        | v850-* | v850e-* | vax-* \
        | we32k-* \
        | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
--- 294,335 ----
        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
        | avr-* \
        | bs2000-* \
!       | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
        | clipper-* | cydra-* \
!       | d10v-* | d30v-* | dlx-* \
        | elxsi-* \
!       | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
        | h8300-* | h8500-* \
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
        | i*86-* | i860-* | i960-* | ia64-* \
+       | ip2k-* \
        | m32r-* \
        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
        | m88110-* | m88k-* | mcore-* \
!       | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
!       | mips16-* \
!       | mips64-* | mips64el-* \
!       | mips64vr-* | mips64vrel-* \
!       | mips64orion-* | mips64orionel-* \
!       | mips64vr4100-* | mips64vr4100el-* \
!       | mips64vr4300-* | mips64vr4300el-* \
!       | mips64vr5000-* | mips64vr5000el-* \
!       | mipsisa32-* | mipsisa32el-* \
!       | mipsisa64-* | mipsisa64el-* \
!       | mipsisa64sb1-* | mipsisa64sb1el-* \
!       | mipsisa64sr71k-* | mipsisa64sr71kel-* \
!       | mipstx39 | mipstx39el \
        | none-* | np1-* | ns16k-* | ns32k-* \
        | orion-* \
        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
        | pyramid-* \
        | romp-* | rs6000-* \
!       | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
!       | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
        | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
        | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
!       | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
        | v850-* | v850e-* | vax-* \
        | we32k-* \
        | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
***************
*** 728,740 ****
        pbb)
                basic_machine=m68k-tti
                ;;
!         pc532 | pc532-*)
                basic_machine=ns32k-pc532
                ;;
        pentium | p5 | k5 | k6 | nexgen | viac3)
                basic_machine=i586-pc
                ;;
!       pentiumpro | p6 | 6x86 | athlon)
                basic_machine=i686-pc
                ;;
        pentiumii | pentium2)
--- 749,761 ----
        pbb)
                basic_machine=m68k-tti
                ;;
!       pc532 | pc532-*)
                basic_machine=ns32k-pc532
                ;;
        pentium | p5 | k5 | k6 | nexgen | viac3)
                basic_machine=i586-pc
                ;;
!       pentiumpro | p6 | 6x86 | athlon | athlon_*)
                basic_machine=i686-pc
                ;;
        pentiumii | pentium2)
***************
*** 755,776 ****
        power)  basic_machine=power-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/^[^-]*-//'`
                ;;
        ppc64)  basic_machine=powerpc64-unknown
!               ;;
        ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 
's/^[^-]*-//'`
                ;;
        ppc64le | powerpc64little | ppc64-le | powerpc64-little)
                basic_machine=powerpc64le-unknown
!               ;;
        ppc64le-* | powerpc64little-*)
                basic_machine=powerpc64le-`echo $basic_machine | sed 
's/^[^-]*-//'`
                ;;
--- 776,797 ----
        power)  basic_machine=power-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/^[^-]*-//'`
                ;;
        ppc64)  basic_machine=powerpc64-unknown
!               ;;
        ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 
's/^[^-]*-//'`
                ;;
        ppc64le | powerpc64little | ppc64-le | powerpc64-little)
                basic_machine=powerpc64le-unknown
!               ;;
        ppc64le-* | powerpc64little-*)
                basic_machine=powerpc64le-`echo $basic_machine | sed 
's/^[^-]*-//'`
                ;;
***************
*** 801,806 ****
--- 822,833 ----
                basic_machine=a29k-amd
                os=-udi
                ;;
+       sb1)
+               basic_machine=mipsisa64sb1-unknown
+               ;;
+       sb1el)
+               basic_machine=mipsisa64sb1el-unknown
+               ;;
        sequent)
                basic_machine=i386-sequent
                ;;
***************
*** 866,872 ****
        sun386 | sun386i | roadrunner)
                basic_machine=i386-sun
                ;;
!         sv1)
                basic_machine=sv1-cray
                os=-unicos
                ;;
--- 893,899 ----
        sun386 | sun386i | roadrunner)
                basic_machine=i386-sun
                ;;
!       sv1)
                basic_machine=sv1-cray
                os=-unicos
                ;;
***************
*** 886,891 ****
--- 913,922 ----
                basic_machine=t90-cray
                os=-unicos
                ;;
+         tic4x | c4x*)
+               basic_machine=tic4x-unknown
+               os=-coff
+               ;;
        tic54x | c54x*)
                basic_machine=tic54x-unknown
                os=-coff
***************
*** 924,931 ****
                os=-vms
                ;;
        vpp*|vx|vx-*)
!                basic_machine=f301-fujitsu
!                ;;
        vxworks960)
                basic_machine=i960-wrs
                os=-vxworks
--- 955,962 ----
                os=-vms
                ;;
        vpp*|vx|vx-*)
!               basic_machine=f301-fujitsu
!               ;;
        vxworks960)
                basic_machine=i960-wrs
                os=-vxworks
***************
*** 946,956 ****
                basic_machine=hppa1.1-winbond
                os=-proelf
                ;;
!       windows32)
!               basic_machine=i386-pc
!               os=-windows32-msvcrt
!               ;;
!         xps | xps100)
                basic_machine=xps100-honeywell
                ;;
        ymp)
--- 977,983 ----
                basic_machine=hppa1.1-winbond
                os=-proelf
                ;;
!       xps | xps100)
                basic_machine=xps100-honeywell
                ;;
        ymp)
***************
*** 996,1002 ****
        we32k)
                basic_machine=we32k-att
                ;;
!       sh3 | sh4 | sh3eb | sh4eb)
                basic_machine=sh-unknown
                ;;
        sh64)
--- 1023,1029 ----
        we32k)
                basic_machine=we32k-att
                ;;
!       sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
                basic_machine=sh-unknown
                ;;
        sh64)
***************
*** 1005,1011 ****
        sparc | sparcv9 | sparcv9b)
                basic_machine=sparc-sun
                ;;
!         cydra)
                basic_machine=cydra-cydrome
                ;;
        orion)
--- 1032,1038 ----
        sparc | sparcv9 | sparcv9b)
                basic_machine=sparc-sun
                ;;
!       cydra)
                basic_machine=cydra-cydrome
                ;;
        orion)
***************
*** 1020,1029 ****
        pmac | pmac-mpw)
                basic_machine=powerpc-apple
                ;;
-       c4x*)
-               basic_machine=c4x-none
-               os=-coff
-               ;;
        *-unknown)
                # Make sure to match an already-canonicalized machine name.
                ;;
--- 1047,1052 ----
***************
*** 1086,1096 ****
              | -chorusos* | -chorusrdb* \
              | -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* | -tops10* | -tenex* | -tops20* | -its* \
              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
!             | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | 
-powermax*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)
--- 1109,1120 ----
              | -chorusos* | -chorusrdb* \
              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
              | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
!             | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
!             | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
!             | -powermax* | -dnix*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)
***************
*** 1155,1161 ****
                os=-rtmk-nova
                ;;
        -ns2 )
!               os=-nextstep2
                ;;
        -nsk*)
                os=-nsk
--- 1179,1185 ----
                os=-rtmk-nova
                ;;
        -ns2 )
!               os=-nextstep2
                ;;
        -nsk*)
                os=-nsk
***************
*** 1194,1201 ****
        -xenix)
                os=-xenix
                ;;
!         -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
!               os=-mint
                ;;
        -none)
                ;;
--- 1218,1225 ----
        -xenix)
                os=-xenix
                ;;
!       -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
!               os=-mint
                ;;
        -none)
                ;;
***************
*** 1232,1238 ****
        pdp10-*)
                os=-tops20
                ;;
!         pdp11-*)
                os=-none
                ;;
        *-dec | vax-*)
--- 1256,1262 ----
        pdp10-*)
                os=-tops20
                ;;
!       pdp11-*)
                os=-none
                ;;
        *-dec | vax-*)
***************
*** 1325,1343 ****
        *-next)
                os=-nextstep3
                ;;
!         *-gould)
                os=-sysv
                ;;
!         *-highlevel)
                os=-bsd
                ;;
        *-encore)
                os=-bsd
                ;;
!         *-sgi)
                os=-irix
                ;;
!         *-siemens)
                os=-sysv4
                ;;
        *-masscomp)
--- 1349,1367 ----
        *-next)
                os=-nextstep3
                ;;
!       *-gould)
                os=-sysv
                ;;
!       *-highlevel)
                os=-bsd
                ;;
        *-encore)
                os=-bsd
                ;;
!       *-sgi)
                os=-irix
                ;;
!       *-siemens)
                os=-sysv4
                ;;
        *-masscomp)