diff options
| -rwxr-xr-x | Build/source/build-aux/config.sub | 767 | ||||
| -rwxr-xr-x | Build/source/libs/freetype2/freetype-src/builds/unix/config.sub | 767 | ||||
| -rwxr-xr-x | Build/source/libs/icu/icu-src/source/config.sub | 767 | ||||
| -rwxr-xr-x | Build/source/utils/asymptote/config.sub | 767 |
4 files changed, 1528 insertions, 1540 deletions
diff --git a/Build/source/build-aux/config.sub b/Build/source/build-aux/config.sub index 98835b480d6..0b4a95027f8 100755 --- a/Build/source/build-aux/config.sub +++ b/Build/source/build-aux/config.sub @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-05-12' +timestamp='2018-05-14' # 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 @@ -117,9 +117,13 @@ EOF # Separate into logical components for further validation case $1 in + *-*-*-*-*) + echo Invalid configuration \`"$1"\': more than four components >&2 + exit 1 + ;; *-*-*-*) basic_machine=$field1-$field2 - os=-$field3-$field4 + os=$field3-$field4 ;; *-*-*) # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two @@ -132,21 +136,21 @@ case $1 in | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ | storm-chaos* | os2-emx* | rtmk-nova*) basic_machine=$field1 - os=-$maybe_os + os=$maybe_os ;; android-linux) basic_machine=$field1-unknown - os=-linux-android + os=linux-android ;; *) basic_machine=$field1-$field2 - os=-$field3 + os=$field3 ;; esac ;; *-*) basic_machine=$field1 - os=-$field2 + os=$field2 ;; *) basic_machine=$1 @@ -159,102 +163,102 @@ esac ### recognize some manufacturers as not being operating systems, so we ### can provide default operating systems below. case $os in - -sun*os*) + sun*os*) # Prevent following clause from handling this invalid input. ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -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 | -knuth | -cray | -microblaze*) + dec* | mips* | sequent* | encore* | pc532* | sgi* | sony* | \ + att* | 7300* | 3300* | delta* | motorola* | sun[234]* | \ + unicom* | ibm* | next | hp | isi* | apollo | altos* | \ + 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 | knuth | cray | microblaze*) os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + bluegene*) + os=cnk ;; - -sim | -cisco | -oki | -wec | -winbond) + sim | cisco | oki | wec | winbond) os= basic_machine=$1 ;; - -scout) + scout) ;; - -wrs) - os=-vxworks + wrs) + os=vxworks basic_machine=$1 ;; - -chorusos*) - os=-chorusos + chorusos*) + os=chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + chorusrdb) + os=chorusrdb basic_machine=$1 ;; - -hiux*) - os=-hiuxwe2 + hiux*) + os=hiuxwe2 ;; - -sco6) - os=-sco5v6 + sco6) + os=sco5v6 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco5) - os=-sco3.2v5 + sco5) + os=sco3.2v5 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco4) - os=-sco3.2v4 + sco4) + os=sco3.2v4 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco3.2.[4-9]*) + sco3.2.[4-9]*) os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco3.2v[4-9]*) + sco3.2v[4-9]*) # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco5v6*) + sco5v6*) # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco*) - os=-sco3.2v2 + sco*) + os=sco3.2v2 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -udk*) + udk*) basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -isc) - os=-isc2.2 + isc) + os=isc2.2 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -clix*) + clix*) basic_machine=clipper-intergraph ;; - -isc*) + isc*) basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -lynx*178) - os=-lynxos178 + lynx*178) + os=lynxos178 ;; - -lynx*5) - os=-lynxos5 + lynx*5) + os=lynxos5 ;; - -lynx*) - os=-lynxos + lynx*) + os=lynxos ;; - -ptx*) + ptx*) basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` ;; - -psos*) - os=-psos + psos*) + os=psos ;; - -mint | -mint[0-9]*) + mint | mint[0-9]*) basic_machine=m68k-atari - os=-mint + os=mint ;; esac @@ -352,13 +356,13 @@ case $basic_machine in ;; m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown - os=-none + os=none ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) ;; m9s12z | m68hcs12z | hcs12z | s12z) basic_machine=s12z-unknown - os=-none + os=none ;; ms1) basic_machine=mt-unknown @@ -369,7 +373,7 @@ case $basic_machine in ;; xgate) basic_machine=$basic_machine-unknown - os=-none + os=none ;; xscaleeb) basic_machine=armeb-unknown @@ -385,11 +389,6 @@ case $basic_machine in i*86 | x86_64) basic_machine=$basic_machine-pc ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 - exit 1 - ;; # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ @@ -484,7 +483,7 @@ case $basic_machine in # for a CPU type and a company and sometimes even an OS. 386bsd) basic_machine=i386-pc - os=-bsd + os=bsd ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) basic_machine=m68000-att @@ -494,14 +493,14 @@ case $basic_machine in ;; a29khif) basic_machine=a29k-amd - os=-udi + os=udi ;; abacus) basic_machine=abacus-unknown ;; adobe68k) basic_machine=m68010-adobe - os=-scout + os=scout ;; alliant | fx80) basic_machine=fx80-alliant @@ -511,7 +510,7 @@ case $basic_machine in ;; am29k) basic_machine=a29k-none - os=-bsd + os=bsd ;; amd64) basic_machine=x86_64-pc @@ -521,53 +520,53 @@ case $basic_machine in ;; amdahl) basic_machine=580-amdahl - os=-sysv + os=sysv ;; amiga | amiga-*) basic_machine=m68k-unknown ;; amigaos | amigados) basic_machine=m68k-unknown - os=-amigaos + os=amigaos ;; amigaunix | amix) basic_machine=m68k-unknown - os=-sysv4 + os=sysv4 ;; apollo68) basic_machine=m68k-apollo - os=-sysv + os=sysv ;; apollo68bsd) basic_machine=m68k-apollo - os=-bsd + os=bsd ;; aros) basic_machine=i386-pc - os=-aros + os=aros ;; asmjs) basic_machine=asmjs-unknown ;; aux) basic_machine=m68k-apple - os=-aux + os=aux ;; balance) basic_machine=ns32k-sequent - os=-dynix + os=dynix ;; blackfin) basic_machine=bfin-unknown - os=-linux + os=linux ;; blackfin-*) basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + os=linux ;; bluegene*) basic_machine=powerpc-ibm - os=-cnk + os=cnk ;; c54x-*) basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` @@ -580,43 +579,43 @@ case $basic_machine in ;; c90) basic_machine=c90-cray - os=-unicos + os=unicos ;; cegcc) basic_machine=arm-unknown - os=-cegcc + os=cegcc ;; convex-c1) basic_machine=c1-convex - os=-bsd + os=bsd ;; convex-c2) basic_machine=c2-convex - os=-bsd + os=bsd ;; convex-c32) basic_machine=c32-convex - os=-bsd + os=bsd ;; convex-c34) basic_machine=c34-convex - os=-bsd + os=bsd ;; convex-c38) basic_machine=c38-convex - os=-bsd + os=bsd ;; cray | j90) basic_machine=j90-cray - os=-unicos + os=unicos ;; craynv) basic_machine=craynv-cray - os=-unicosmp + os=unicosmp ;; cr16 | cr16-*) basic_machine=cr16-unknown - os=-elf + os=elf ;; crds | unos) basic_machine=m68k-crds @@ -629,7 +628,7 @@ case $basic_machine in ;; crx) basic_machine=crx-unknown - os=-elf + os=elf ;; da30 | da30-*) basic_machine=m68k-da30 @@ -639,11 +638,11 @@ case $basic_machine in ;; decsystem10* | dec10*) basic_machine=pdp10-dec - os=-tops10 + os=tops10 ;; decsystem20* | dec20*) basic_machine=pdp10-dec - os=-tops20 + os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) @@ -651,23 +650,23 @@ case $basic_machine in ;; delta88) basic_machine=m88k-motorola - os=-sysv3 + os=sysv3 ;; dicos) basic_machine=i686-pc - os=-dicos + os=dicos ;; djgpp) basic_machine=i586-pc - os=-msdosdjgpp + os=msdosdjgpp ;; dpx20 | dpx20-*) basic_machine=rs6000-bull - os=-bosx + os=bosx ;; dpx2*) basic_machine=m68k-bull - os=-sysv3 + os=sysv3 ;; e500v[12]) basic_machine=powerpc-unknown @@ -679,18 +678,18 @@ case $basic_machine in ;; ebmon29k) basic_machine=a29k-amd - os=-ebmon + os=ebmon ;; elxsi) basic_machine=elxsi-elxsi - os=-bsd + os=bsd ;; encore | umax | mmax) basic_machine=ns32k-encore ;; es1800 | OSE68k | ose68k | ose | OSE) basic_machine=m68k-ericsson - os=-ose + os=ose ;; fx2800) basic_machine=i860-alliant @@ -700,42 +699,42 @@ case $basic_machine in ;; gmicro) basic_machine=tron-gmicro - os=-sysv + os=sysv ;; go32) basic_machine=i386-pc - os=-go32 + os=go32 ;; h3050r* | hiux*) basic_machine=hppa1.1-hitachi - os=-hiuxwe2 + os=hiuxwe2 ;; h8300hms) basic_machine=h8300-hitachi - os=-hms + os=hms ;; h8300xray) basic_machine=h8300-hitachi - os=-xray + os=xray ;; h8500hms) basic_machine=h8500-hitachi - os=-hms + os=hms ;; harris) basic_machine=m88k-harris - os=-sysv3 + os=sysv3 ;; hp300-*) basic_machine=m68k-hp ;; hp300bsd) basic_machine=m68k-hp - os=-bsd + os=bsd ;; hp300hpux) basic_machine=m68k-hp - os=-hpux + os=hpux ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) basic_machine=hppa1.0-hp @@ -768,93 +767,93 @@ case $basic_machine in ;; hppaosf) basic_machine=hppa1.1-hp - os=-osf + os=osf ;; hppro) basic_machine=hppa1.1-hp - os=-proelf + os=proelf ;; i370-ibm* | ibm*) basic_machine=i370-ibm ;; i*86v32) basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv32 + os=sysv32 ;; i*86v4*) basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv4 + os=sysv4 ;; i*86v) basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv + os=sysv ;; i*86sol2) basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-solaris2 + os=solaris2 ;; i386mach) basic_machine=i386-mach - os=-mach + os=mach ;; vsta) basic_machine=i386-unknown - os=-vsta + os=vsta ;; iris | iris4d) basic_machine=mips-sgi case $os in - -irix*) + irix*) ;; *) - os=-irix4 + os=irix4 ;; esac ;; isi68 | isi) basic_machine=m68k-isi - os=-sysv + os=sysv ;; leon-*|leon[3-9]-*) basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` ;; m68knommu) basic_machine=m68k-unknown - os=-linux + os=linux ;; m68knommu-*) basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + os=linux ;; magnum | m3230) basic_machine=mips-mips - os=-sysv + os=sysv ;; merlin) basic_machine=ns32k-utek - os=-sysv + os=sysv ;; microblaze*) basic_machine=microblaze-xilinx ;; mingw64) basic_machine=x86_64-pc - os=-mingw64 + os=mingw64 ;; mingw32) basic_machine=i686-pc - os=-mingw32 + os=mingw32 ;; mingw32ce) basic_machine=arm-unknown - os=-mingw32ce + os=mingw32ce ;; miniframe) basic_machine=m68000-convergent ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) basic_machine=m68k-atari - os=-mint + os=mint ;; mips3*-*) basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` @@ -864,95 +863,95 @@ case $basic_machine in ;; monitor) basic_machine=m68k-rom68k - os=-coff + os=coff ;; morphos) basic_machine=powerpc-unknown - os=-morphos + os=morphos ;; moxiebox) basic_machine=moxie-unknown - os=-moxiebox + os=moxiebox ;; msdos) basic_machine=i386-pc - os=-msdos + os=msdos ;; ms1-*) basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` ;; msys) basic_machine=i686-pc - os=-msys + os=msys ;; mvs) basic_machine=i370-ibm - os=-mvs + os=mvs ;; nacl) basic_machine=le32-unknown - os=-nacl + os=nacl ;; ncr3000) basic_machine=i486-ncr - os=-sysv4 + os=sysv4 ;; netbsd386) basic_machine=i386-unknown - os=-netbsd + os=netbsd ;; netwinder) basic_machine=armv4l-rebel - os=-linux + os=linux ;; news | news700 | news800 | news900) basic_machine=m68k-sony - os=-newsos + os=newsos ;; news1000) basic_machine=m68030-sony - os=-newsos + os=newsos ;; news-3600 | risc-news) basic_machine=mips-sony - os=-newsos + os=newsos ;; necv70) basic_machine=v70-nec - os=-sysv + os=sysv ;; next | m*-next) basic_machine=m68k-next case $os in - -nextstep* ) + nextstep* ) ;; - -ns2*) - os=-nextstep2 + ns2*) + os=nextstep2 ;; *) - os=-nextstep3 + os=nextstep3 ;; esac ;; nh3000) basic_machine=m68k-harris - os=-cxux + os=cxux ;; nh[45]000) basic_machine=m88k-harris - os=-cxux + os=cxux ;; nindy960) basic_machine=i960-intel - os=-nindy + os=nindy ;; mon960) basic_machine=i960-intel - os=-mon960 + os=mon960 ;; nonstopux) basic_machine=mips-compaq - os=-nonstopux + os=nonstopux ;; np1) basic_machine=np1-gould @@ -974,38 +973,38 @@ case $basic_machine in ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki - os=-proelf + os=proelf ;; openrisc | openrisc-*) basic_machine=or32-unknown ;; os400) basic_machine=powerpc-ibm - os=-os400 + os=os400 ;; OSE68000 | ose68000) basic_machine=m68000-ericsson - os=-ose + os=ose ;; os68k) basic_machine=m68k-none - os=-os68k + os=os68k ;; pa-hitachi) basic_machine=hppa1.1-hitachi - os=-hiuxwe2 + os=hiuxwe2 ;; paragon) basic_machine=i860-intel - os=-osf + os=osf ;; parisc) basic_machine=hppa-unknown - os=-linux + os=linux ;; parisc-*) basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + os=linux ;; pbd) basic_machine=sparc-tti @@ -1077,19 +1076,19 @@ case $basic_machine in ;; pw32) basic_machine=i586-unknown - os=-pw32 + os=pw32 ;; rdos | rdos64) basic_machine=x86_64-pc - os=-rdos + os=rdos ;; rdos32) basic_machine=i386-pc - os=-rdos + os=rdos ;; rom68k) basic_machine=m68k-rom68k - os=-coff + os=coff ;; rm[46]00) basic_machine=mips-siemens @@ -1105,7 +1104,7 @@ case $basic_machine in ;; sa29200) basic_machine=a29k-amd - os=-udi + os=udi ;; sb1) basic_machine=mipsisa64sb1-unknown @@ -1115,11 +1114,11 @@ case $basic_machine in ;; sde) basic_machine=mipsisa32-sde - os=-elf + os=elf ;; sei) basic_machine=mips-sei - os=-seiux + os=seiux ;; sequent) basic_machine=i386-sequent @@ -1129,11 +1128,11 @@ case $basic_machine in ;; simso-wrs) basic_machine=sparclite-wrs - os=-vxworks + os=vxworks ;; sps7) basic_machine=m68k-bull - os=-sysv2 + os=sysv2 ;; spur) basic_machine=spur-unknown @@ -1143,7 +1142,7 @@ case $basic_machine in ;; stratus) basic_machine=i860-stratus - os=-sysv4 + os=sysv4 ;; strongarm-* | thumb-*) basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` @@ -1153,31 +1152,31 @@ case $basic_machine in ;; sun2os3) basic_machine=m68000-sun - os=-sunos3 + os=sunos3 ;; sun2os4) basic_machine=m68000-sun - os=-sunos4 + os=sunos4 ;; sun3os3) basic_machine=m68k-sun - os=-sunos3 + os=sunos3 ;; sun3os4) basic_machine=m68k-sun - os=-sunos4 + os=sunos4 ;; sun4os3) basic_machine=sparc-sun - os=-sunos3 + os=sunos3 ;; sun4os4) basic_machine=sparc-sun - os=-sunos4 + os=sunos4 ;; sun4sol2) basic_machine=sparc-sun - os=-solaris2 + os=solaris2 ;; sun3 | sun3-*) basic_machine=m68k-sun @@ -1190,23 +1189,23 @@ case $basic_machine in ;; sv1) basic_machine=sv1-cray - os=-unicos + os=unicos ;; symmetry) basic_machine=i386-sequent - os=-dynix + os=dynix ;; t3e) basic_machine=alphaev5-cray - os=-unicos + os=unicos ;; t90) basic_machine=t90-cray - os=-unicos + os=unicos ;; tile*) basic_machine=$basic_machine-unknown - os=-linux-gnu + os=linux-gnu ;; tx39) basic_machine=mipstx39-unknown @@ -1216,64 +1215,64 @@ case $basic_machine in ;; toad1) basic_machine=pdp10-xkl - os=-tops20 + os=tops20 ;; tower | tower-32) basic_machine=m68k-ncr ;; tpf) basic_machine=s390x-ibm - os=-tpf + os=tpf ;; udi29k) basic_machine=a29k-amd - os=-udi + os=udi ;; ultra3) basic_machine=a29k-nyu - os=-sym1 + os=sym1 ;; v810 | necv810) basic_machine=v810-nec - os=-none + os=none ;; vaxv) basic_machine=vax-dec - os=-sysv + os=sysv ;; vms) basic_machine=vax-dec - os=-vms + os=vms ;; vpp*|vx|vx-*) basic_machine=f301-fujitsu ;; vxworks960) basic_machine=i960-wrs - os=-vxworks + os=vxworks ;; vxworks68) basic_machine=m68k-wrs - os=-vxworks + os=vxworks ;; vxworks29k) basic_machine=a29k-wrs - os=-vxworks + os=vxworks ;; w65*) basic_machine=w65-wdc - os=-none + os=none ;; w89k-*) basic_machine=hppa1.1-winbond - os=-proelf + os=proelf ;; x64) basic_machine=x86_64-pc ;; xbox) basic_machine=i686-pc - os=-mingw32 + os=mingw32 ;; xps | xps100) basic_machine=xps100-honeywell @@ -1283,11 +1282,11 @@ case $basic_machine in ;; ymp) basic_machine=ymp-cray - os=-unicos + os=unicos ;; none) basic_machine=none-none - os=-none + os=none ;; # Here we handle the default manufacturer of certain CPU types. It is in @@ -1365,196 +1364,194 @@ 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. - -auroraux) - os=-auroraux + # solaris* is a basic system type, with this one exception. + auroraux) + os=auroraux ;; - -solaris1 | -solaris1.*) + solaris1 | solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; - -solaris) - os=-solaris2 + solaris) + os=solaris2 ;; - -unixware*) - os=-sysv4.2uw + unixware*) + os=sysv4.2uw ;; - -gnu/linux*) + gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; # es1800 is here to avoid being matched by es* (a different OS) - -es1800*) - os=-ose + es1800*) + os=ose ;; # Now accept the basic system types. # The portable systems comes first. # Each alternative MUST end in a * to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* | -cloudabi* | -sortix* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \ - | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ - | -midnightbsd*) + # sysv* is not here because it comes later, after sysvr4. + gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | sco* | esix* | isc* | aix* | cnk* | sunos | sunos[34]*\ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | kopensolaris* | plan9* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | rtu* | xenix* \ + | hiux* | knetbsd* | mirbsd* | netbsd* \ + | bitrig* | openbsd* | solidbsd* | libertybsd* \ + | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusos* | chorusrdb* | cegcc* | glidix* \ + | cygwin* | msys* | pe* | psos* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \ + | linux-newlib* | linux-musl* | linux-uclibc* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* \ + | morphos* | superux* | rtmk* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; - -qnx*) + qnx*) case $basic_machine in x86-* | i*86-*) ;; *) - os=-nto$os + os=nto-$os ;; esac ;; - -nto-qnx*) + nto-qnx*) ;; - -nto*) + nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - -sim | -xray | -os68k* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + sim | xray | os68k* | v88r* \ + | windows* | osx | abug | netware* | os9* \ + | macos* | mpw* | magic* | mmixware* | mon960* | lnews*) ;; - -mac*) + mac*) os=`echo "$os" | sed -e 's|mac|macos|'` ;; - -linux-dietlibc) - os=-linux-dietlibc + linux-dietlibc) + os=linux-dietlibc ;; - -linux*) + linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; - -sunos5*) + sunos5*) os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; - -sunos6*) + sunos6*) os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; - -opened*) - os=-openedition + opened*) + os=openedition ;; - -os400*) - os=-os400 + os400*) + os=os400 ;; - -wince*) - os=-wince + wince*) + os=wince ;; - -utek*) - os=-bsd + utek*) + os=bsd ;; - -dynix*) - os=-bsd + dynix*) + os=bsd ;; - -acis*) - os=-aos + acis*) + os=aos ;; - -atheos*) - os=-atheos + atheos*) + os=atheos ;; - -syllable*) - os=-syllable + syllable*) + os=syllable ;; - -386bsd) - os=-bsd + 386bsd) + os=bsd ;; - -ctix* | -uts*) - os=-sysv + ctix* | uts*) + os=sysv ;; - -nova*) - os=-rtmk-nova + nova*) + os=rtmk-nova ;; - -ns2) - os=-nextstep2 + ns2) + os=nextstep2 ;; - -nsk*) - os=-nsk + nsk*) + os=nsk ;; # Preserve the version number of sinix5. - -sinix5.*) + sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` ;; - -sinix*) - os=-sysv4 + sinix*) + os=sysv4 ;; - -tpf*) - os=-tpf + tpf*) + os=tpf ;; - -triton*) - os=-sysv3 + triton*) + os=sysv3 ;; - -oss*) - os=-sysv3 + oss*) + os=sysv3 ;; - -svr4*) - os=-sysv4 + svr4*) + os=sysv4 ;; - -svr3) - os=-sysv3 + svr3) + os=sysv3 ;; - -sysvr4) - os=-sysv4 + sysvr4) + os=sysv4 ;; - # This must come after -sysvr4. - -sysv*) + # This must come after sysvr4. + sysv*) ;; - -ose*) - os=-ose + ose*) + os=ose ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint + *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + os=mint ;; - -zvmoe) - os=-zvmoe + zvmoe) + os=zvmoe ;; - -dicos*) - os=-dicos + dicos*) + os=dicos ;; - -pikeos*) + pikeos*) # Until real need of OS specific support for # particular features comes up, bare metal # configurations are quite functional. case $basic_machine in arm*) - os=-eabi + os=eabi ;; *) - os=-elf + os=elf ;; esac ;; - -nacl*) + nacl*) ;; - -ios) + ios) ;; - -none) + none) ;; - -*-eabi) + *-eabi) ;; *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; @@ -1573,173 +1570,173 @@ else case $basic_machine in score-*) - os=-elf + os=elf ;; spu-*) - os=-elf + os=elf ;; *-acorn) - os=-riscix1.2 + os=riscix1.2 ;; arm*-rebel) - os=-linux + os=linux ;; arm*-semi) - os=-aout + os=aout ;; c4x-* | tic4x-*) - os=-coff + os=coff ;; c8051-*) - os=-elf + os=elf ;; hexagon-*) - os=-elf + os=elf ;; tic54x-*) - os=-coff + os=coff ;; tic55x-*) - os=-coff + os=coff ;; tic6x-*) - os=-coff + os=coff ;; # This must come before the *-dec entry. pdp10-*) - os=-tops20 + os=tops20 ;; pdp11-*) - os=-none + os=none ;; *-dec | vax-*) - os=-ultrix4.2 + os=ultrix4.2 ;; m68*-apollo) - os=-domain + os=domain ;; i386-sun) - os=-sunos4.0.2 + os=sunos4.0.2 ;; m68000-sun) - os=-sunos3 + os=sunos3 ;; m68*-cisco) - os=-aout + os=aout ;; mep-*) - os=-elf + os=elf ;; mips*-cisco) - os=-elf + os=elf ;; mips*-*) - os=-elf + os=elf ;; or32-*) - os=-coff + os=coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 + os=sysv3 ;; sparc-* | *-sun) - os=-sunos4.1.1 + os=sunos4.1.1 ;; pru-*) - os=-elf + os=elf ;; *-be) - os=-beos + os=beos ;; *-ibm) - os=-aix + os=aix ;; *-knuth) - os=-mmixware + os=mmixware ;; *-wec) - os=-proelf + os=proelf ;; *-winbond) - os=-proelf + os=proelf ;; *-oki) - os=-proelf + os=proelf ;; *-hp) - os=-hpux + os=hpux ;; *-hitachi) - os=-hiux + os=hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv + os=sysv ;; *-cbm) - os=-amigaos + os=amigaos ;; *-dg) - os=-dgux + os=dgux ;; *-dolphin) - os=-sysv3 + os=sysv3 ;; m68k-ccur) - os=-rtu + os=rtu ;; m88k-omron*) - os=-luna + os=luna ;; *-next) - os=-nextstep + os=nextstep ;; *-sequent) - os=-ptx + os=ptx ;; *-crds) - os=-unos + os=unos ;; *-ns) - os=-genix + os=genix ;; i370-*) - os=-mvs + os=mvs ;; *-gould) - os=-sysv + os=sysv ;; *-highlevel) - os=-bsd + os=bsd ;; *-encore) - os=-bsd + os=bsd ;; *-sgi) - os=-irix + os=irix ;; *-siemens) - os=-sysv4 + os=sysv4 ;; *-masscomp) - os=-rtu + os=rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=-uxpv + os=uxpv ;; *-rom68k) - os=-coff + os=coff ;; *-*bug) - os=-coff + os=coff ;; *-apple) - os=-macos + os=macos ;; *-atari*) - os=-mint + os=mint ;; *) - os=-none + os=none ;; esac fi @@ -1750,67 +1747,67 @@ vendor=unknown case $basic_machine in *-unknown) case $os in - -riscix*) + riscix*) vendor=acorn ;; - -sunos*) + sunos*) vendor=sun ;; - -cnk*|-aix*) + cnk*|-aix*) vendor=ibm ;; - -beos*) + beos*) vendor=be ;; - -hpux*) + hpux*) vendor=hp ;; - -mpeix*) + mpeix*) vendor=hp ;; - -hiux*) + hiux*) vendor=hitachi ;; - -unos*) + unos*) vendor=crds ;; - -dgux*) + dgux*) vendor=dg ;; - -luna*) + luna*) vendor=omron ;; - -genix*) + genix*) vendor=ns ;; - -mvs* | -opened*) + mvs* | opened*) vendor=ibm ;; - -os400*) + os400*) vendor=ibm ;; - -ptx*) + ptx*) vendor=sequent ;; - -tpf*) + tpf*) vendor=ibm ;; - -vxsim* | -vxworks* | -windiss*) + vxsim* | vxworks* | windiss*) vendor=wrs ;; - -aux*) + aux*) vendor=apple ;; - -hms*) + hms*) vendor=hitachi ;; - -mpw* | -macos*) + mpw* | macos*) vendor=apple ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) vendor=atari ;; - -vos*) + vos*) vendor=stratus ;; esac @@ -1818,7 +1815,7 @@ case $basic_machine in ;; esac -echo "$basic_machine$os" +echo "$basic_machine-$os" exit # Local variables: diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/config.sub b/Build/source/libs/freetype2/freetype-src/builds/unix/config.sub index 98835b480d6..0b4a95027f8 100755 --- a/Build/source/libs/freetype2/freetype-src/builds/unix/config.sub +++ b/Build/source/libs/freetype2/freetype-src/builds/unix/config.sub @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-05-12' +timestamp='2018-05-14' # 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 @@ -117,9 +117,13 @@ EOF # Separate into logical components for further validation case $1 in + *-*-*-*-*) + echo Invalid configuration \`"$1"\': more than four components >&2 + exit 1 + ;; *-*-*-*) basic_machine=$field1-$field2 - os=-$field3-$field4 + os=$field3-$field4 ;; *-*-*) # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two @@ -132,21 +136,21 @@ case $1 in | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ | storm-chaos* | os2-emx* | rtmk-nova*) basic_machine=$field1 - os=-$maybe_os + os=$maybe_os ;; android-linux) basic_machine=$field1-unknown - os=-linux-android + os=linux-android ;; *) basic_machine=$field1-$field2 - os=-$field3 + os=$field3 ;; esac ;; *-*) basic_machine=$field1 - os=-$field2 + os=$field2 ;; *) basic_machine=$1 @@ -159,102 +163,102 @@ esac ### recognize some manufacturers as not being operating systems, so we ### can provide default operating systems below. case $os in - -sun*os*) + sun*os*) # Prevent following clause from handling this invalid input. ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -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 | -knuth | -cray | -microblaze*) + dec* | mips* | sequent* | encore* | pc532* | sgi* | sony* | \ + att* | 7300* | 3300* | delta* | motorola* | sun[234]* | \ + unicom* | ibm* | next | hp | isi* | apollo | altos* | \ + 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 | knuth | cray | microblaze*) os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + bluegene*) + os=cnk ;; - -sim | -cisco | -oki | -wec | -winbond) + sim | cisco | oki | wec | winbond) os= basic_machine=$1 ;; - -scout) + scout) ;; - -wrs) - os=-vxworks + wrs) + os=vxworks basic_machine=$1 ;; - -chorusos*) - os=-chorusos + chorusos*) + os=chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + chorusrdb) + os=chorusrdb basic_machine=$1 ;; - -hiux*) - os=-hiuxwe2 + hiux*) + os=hiuxwe2 ;; - -sco6) - os=-sco5v6 + sco6) + os=sco5v6 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco5) - os=-sco3.2v5 + sco5) + os=sco3.2v5 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco4) - os=-sco3.2v4 + sco4) + os=sco3.2v4 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco3.2.[4-9]*) + sco3.2.[4-9]*) os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco3.2v[4-9]*) + sco3.2v[4-9]*) # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco5v6*) + sco5v6*) # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco*) - os=-sco3.2v2 + sco*) + os=sco3.2v2 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -udk*) + udk*) basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -isc) - os=-isc2.2 + isc) + os=isc2.2 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -clix*) + clix*) basic_machine=clipper-intergraph ;; - -isc*) + isc*) basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -lynx*178) - os=-lynxos178 + lynx*178) + os=lynxos178 ;; - -lynx*5) - os=-lynxos5 + lynx*5) + os=lynxos5 ;; - -lynx*) - os=-lynxos + lynx*) + os=lynxos ;; - -ptx*) + ptx*) basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` ;; - -psos*) - os=-psos + psos*) + os=psos ;; - -mint | -mint[0-9]*) + mint | mint[0-9]*) basic_machine=m68k-atari - os=-mint + os=mint ;; esac @@ -352,13 +356,13 @@ case $basic_machine in ;; m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown - os=-none + os=none ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) ;; m9s12z | m68hcs12z | hcs12z | s12z) basic_machine=s12z-unknown - os=-none + os=none ;; ms1) basic_machine=mt-unknown @@ -369,7 +373,7 @@ case $basic_machine in ;; xgate) basic_machine=$basic_machine-unknown - os=-none + os=none ;; xscaleeb) basic_machine=armeb-unknown @@ -385,11 +389,6 @@ case $basic_machine in i*86 | x86_64) basic_machine=$basic_machine-pc ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 - exit 1 - ;; # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ @@ -484,7 +483,7 @@ case $basic_machine in # for a CPU type and a company and sometimes even an OS. 386bsd) basic_machine=i386-pc - os=-bsd + os=bsd ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) basic_machine=m68000-att @@ -494,14 +493,14 @@ case $basic_machine in ;; a29khif) basic_machine=a29k-amd - os=-udi + os=udi ;; abacus) basic_machine=abacus-unknown ;; adobe68k) basic_machine=m68010-adobe - os=-scout + os=scout ;; alliant | fx80) basic_machine=fx80-alliant @@ -511,7 +510,7 @@ case $basic_machine in ;; am29k) basic_machine=a29k-none - os=-bsd + os=bsd ;; amd64) basic_machine=x86_64-pc @@ -521,53 +520,53 @@ case $basic_machine in ;; amdahl) basic_machine=580-amdahl - os=-sysv + os=sysv ;; amiga | amiga-*) basic_machine=m68k-unknown ;; amigaos | amigados) basic_machine=m68k-unknown - os=-amigaos + os=amigaos ;; amigaunix | amix) basic_machine=m68k-unknown - os=-sysv4 + os=sysv4 ;; apollo68) basic_machine=m68k-apollo - os=-sysv + os=sysv ;; apollo68bsd) basic_machine=m68k-apollo - os=-bsd + os=bsd ;; aros) basic_machine=i386-pc - os=-aros + os=aros ;; asmjs) basic_machine=asmjs-unknown ;; aux) basic_machine=m68k-apple - os=-aux + os=aux ;; balance) basic_machine=ns32k-sequent - os=-dynix + os=dynix ;; blackfin) basic_machine=bfin-unknown - os=-linux + os=linux ;; blackfin-*) basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + os=linux ;; bluegene*) basic_machine=powerpc-ibm - os=-cnk + os=cnk ;; c54x-*) basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` @@ -580,43 +579,43 @@ case $basic_machine in ;; c90) basic_machine=c90-cray - os=-unicos + os=unicos ;; cegcc) basic_machine=arm-unknown - os=-cegcc + os=cegcc ;; convex-c1) basic_machine=c1-convex - os=-bsd + os=bsd ;; convex-c2) basic_machine=c2-convex - os=-bsd + os=bsd ;; convex-c32) basic_machine=c32-convex - os=-bsd + os=bsd ;; convex-c34) basic_machine=c34-convex - os=-bsd + os=bsd ;; convex-c38) basic_machine=c38-convex - os=-bsd + os=bsd ;; cray | j90) basic_machine=j90-cray - os=-unicos + os=unicos ;; craynv) basic_machine=craynv-cray - os=-unicosmp + os=unicosmp ;; cr16 | cr16-*) basic_machine=cr16-unknown - os=-elf + os=elf ;; crds | unos) basic_machine=m68k-crds @@ -629,7 +628,7 @@ case $basic_machine in ;; crx) basic_machine=crx-unknown - os=-elf + os=elf ;; da30 | da30-*) basic_machine=m68k-da30 @@ -639,11 +638,11 @@ case $basic_machine in ;; decsystem10* | dec10*) basic_machine=pdp10-dec - os=-tops10 + os=tops10 ;; decsystem20* | dec20*) basic_machine=pdp10-dec - os=-tops20 + os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) @@ -651,23 +650,23 @@ case $basic_machine in ;; delta88) basic_machine=m88k-motorola - os=-sysv3 + os=sysv3 ;; dicos) basic_machine=i686-pc - os=-dicos + os=dicos ;; djgpp) basic_machine=i586-pc - os=-msdosdjgpp + os=msdosdjgpp ;; dpx20 | dpx20-*) basic_machine=rs6000-bull - os=-bosx + os=bosx ;; dpx2*) basic_machine=m68k-bull - os=-sysv3 + os=sysv3 ;; e500v[12]) basic_machine=powerpc-unknown @@ -679,18 +678,18 @@ case $basic_machine in ;; ebmon29k) basic_machine=a29k-amd - os=-ebmon + os=ebmon ;; elxsi) basic_machine=elxsi-elxsi - os=-bsd + os=bsd ;; encore | umax | mmax) basic_machine=ns32k-encore ;; es1800 | OSE68k | ose68k | ose | OSE) basic_machine=m68k-ericsson - os=-ose + os=ose ;; fx2800) basic_machine=i860-alliant @@ -700,42 +699,42 @@ case $basic_machine in ;; gmicro) basic_machine=tron-gmicro - os=-sysv + os=sysv ;; go32) basic_machine=i386-pc - os=-go32 + os=go32 ;; h3050r* | hiux*) basic_machine=hppa1.1-hitachi - os=-hiuxwe2 + os=hiuxwe2 ;; h8300hms) basic_machine=h8300-hitachi - os=-hms + os=hms ;; h8300xray) basic_machine=h8300-hitachi - os=-xray + os=xray ;; h8500hms) basic_machine=h8500-hitachi - os=-hms + os=hms ;; harris) basic_machine=m88k-harris - os=-sysv3 + os=sysv3 ;; hp300-*) basic_machine=m68k-hp ;; hp300bsd) basic_machine=m68k-hp - os=-bsd + os=bsd ;; hp300hpux) basic_machine=m68k-hp - os=-hpux + os=hpux ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) basic_machine=hppa1.0-hp @@ -768,93 +767,93 @@ case $basic_machine in ;; hppaosf) basic_machine=hppa1.1-hp - os=-osf + os=osf ;; hppro) basic_machine=hppa1.1-hp - os=-proelf + os=proelf ;; i370-ibm* | ibm*) basic_machine=i370-ibm ;; i*86v32) basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv32 + os=sysv32 ;; i*86v4*) basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv4 + os=sysv4 ;; i*86v) basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv + os=sysv ;; i*86sol2) basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-solaris2 + os=solaris2 ;; i386mach) basic_machine=i386-mach - os=-mach + os=mach ;; vsta) basic_machine=i386-unknown - os=-vsta + os=vsta ;; iris | iris4d) basic_machine=mips-sgi case $os in - -irix*) + irix*) ;; *) - os=-irix4 + os=irix4 ;; esac ;; isi68 | isi) basic_machine=m68k-isi - os=-sysv + os=sysv ;; leon-*|leon[3-9]-*) basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` ;; m68knommu) basic_machine=m68k-unknown - os=-linux + os=linux ;; m68knommu-*) basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + os=linux ;; magnum | m3230) basic_machine=mips-mips - os=-sysv + os=sysv ;; merlin) basic_machine=ns32k-utek - os=-sysv + os=sysv ;; microblaze*) basic_machine=microblaze-xilinx ;; mingw64) basic_machine=x86_64-pc - os=-mingw64 + os=mingw64 ;; mingw32) basic_machine=i686-pc - os=-mingw32 + os=mingw32 ;; mingw32ce) basic_machine=arm-unknown - os=-mingw32ce + os=mingw32ce ;; miniframe) basic_machine=m68000-convergent ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) basic_machine=m68k-atari - os=-mint + os=mint ;; mips3*-*) basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` @@ -864,95 +863,95 @@ case $basic_machine in ;; monitor) basic_machine=m68k-rom68k - os=-coff + os=coff ;; morphos) basic_machine=powerpc-unknown - os=-morphos + os=morphos ;; moxiebox) basic_machine=moxie-unknown - os=-moxiebox + os=moxiebox ;; msdos) basic_machine=i386-pc - os=-msdos + os=msdos ;; ms1-*) basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` ;; msys) basic_machine=i686-pc - os=-msys + os=msys ;; mvs) basic_machine=i370-ibm - os=-mvs + os=mvs ;; nacl) basic_machine=le32-unknown - os=-nacl + os=nacl ;; ncr3000) basic_machine=i486-ncr - os=-sysv4 + os=sysv4 ;; netbsd386) basic_machine=i386-unknown - os=-netbsd + os=netbsd ;; netwinder) basic_machine=armv4l-rebel - os=-linux + os=linux ;; news | news700 | news800 | news900) basic_machine=m68k-sony - os=-newsos + os=newsos ;; news1000) basic_machine=m68030-sony - os=-newsos + os=newsos ;; news-3600 | risc-news) basic_machine=mips-sony - os=-newsos + os=newsos ;; necv70) basic_machine=v70-nec - os=-sysv + os=sysv ;; next | m*-next) basic_machine=m68k-next case $os in - -nextstep* ) + nextstep* ) ;; - -ns2*) - os=-nextstep2 + ns2*) + os=nextstep2 ;; *) - os=-nextstep3 + os=nextstep3 ;; esac ;; nh3000) basic_machine=m68k-harris - os=-cxux + os=cxux ;; nh[45]000) basic_machine=m88k-harris - os=-cxux + os=cxux ;; nindy960) basic_machine=i960-intel - os=-nindy + os=nindy ;; mon960) basic_machine=i960-intel - os=-mon960 + os=mon960 ;; nonstopux) basic_machine=mips-compaq - os=-nonstopux + os=nonstopux ;; np1) basic_machine=np1-gould @@ -974,38 +973,38 @@ case $basic_machine in ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki - os=-proelf + os=proelf ;; openrisc | openrisc-*) basic_machine=or32-unknown ;; os400) basic_machine=powerpc-ibm - os=-os400 + os=os400 ;; OSE68000 | ose68000) basic_machine=m68000-ericsson - os=-ose + os=ose ;; os68k) basic_machine=m68k-none - os=-os68k + os=os68k ;; pa-hitachi) basic_machine=hppa1.1-hitachi - os=-hiuxwe2 + os=hiuxwe2 ;; paragon) basic_machine=i860-intel - os=-osf + os=osf ;; parisc) basic_machine=hppa-unknown - os=-linux + os=linux ;; parisc-*) basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + os=linux ;; pbd) basic_machine=sparc-tti @@ -1077,19 +1076,19 @@ case $basic_machine in ;; pw32) basic_machine=i586-unknown - os=-pw32 + os=pw32 ;; rdos | rdos64) basic_machine=x86_64-pc - os=-rdos + os=rdos ;; rdos32) basic_machine=i386-pc - os=-rdos + os=rdos ;; rom68k) basic_machine=m68k-rom68k - os=-coff + os=coff ;; rm[46]00) basic_machine=mips-siemens @@ -1105,7 +1104,7 @@ case $basic_machine in ;; sa29200) basic_machine=a29k-amd - os=-udi + os=udi ;; sb1) basic_machine=mipsisa64sb1-unknown @@ -1115,11 +1114,11 @@ case $basic_machine in ;; sde) basic_machine=mipsisa32-sde - os=-elf + os=elf ;; sei) basic_machine=mips-sei - os=-seiux + os=seiux ;; sequent) basic_machine=i386-sequent @@ -1129,11 +1128,11 @@ case $basic_machine in ;; simso-wrs) basic_machine=sparclite-wrs - os=-vxworks + os=vxworks ;; sps7) basic_machine=m68k-bull - os=-sysv2 + os=sysv2 ;; spur) basic_machine=spur-unknown @@ -1143,7 +1142,7 @@ case $basic_machine in ;; stratus) basic_machine=i860-stratus - os=-sysv4 + os=sysv4 ;; strongarm-* | thumb-*) basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` @@ -1153,31 +1152,31 @@ case $basic_machine in ;; sun2os3) basic_machine=m68000-sun - os=-sunos3 + os=sunos3 ;; sun2os4) basic_machine=m68000-sun - os=-sunos4 + os=sunos4 ;; sun3os3) basic_machine=m68k-sun - os=-sunos3 + os=sunos3 ;; sun3os4) basic_machine=m68k-sun - os=-sunos4 + os=sunos4 ;; sun4os3) basic_machine=sparc-sun - os=-sunos3 + os=sunos3 ;; sun4os4) basic_machine=sparc-sun - os=-sunos4 + os=sunos4 ;; sun4sol2) basic_machine=sparc-sun - os=-solaris2 + os=solaris2 ;; sun3 | sun3-*) basic_machine=m68k-sun @@ -1190,23 +1189,23 @@ case $basic_machine in ;; sv1) basic_machine=sv1-cray - os=-unicos + os=unicos ;; symmetry) basic_machine=i386-sequent - os=-dynix + os=dynix ;; t3e) basic_machine=alphaev5-cray - os=-unicos + os=unicos ;; t90) basic_machine=t90-cray - os=-unicos + os=unicos ;; tile*) basic_machine=$basic_machine-unknown - os=-linux-gnu + os=linux-gnu ;; tx39) basic_machine=mipstx39-unknown @@ -1216,64 +1215,64 @@ case $basic_machine in ;; toad1) basic_machine=pdp10-xkl - os=-tops20 + os=tops20 ;; tower | tower-32) basic_machine=m68k-ncr ;; tpf) basic_machine=s390x-ibm - os=-tpf + os=tpf ;; udi29k) basic_machine=a29k-amd - os=-udi + os=udi ;; ultra3) basic_machine=a29k-nyu - os=-sym1 + os=sym1 ;; v810 | necv810) basic_machine=v810-nec - os=-none + os=none ;; vaxv) basic_machine=vax-dec - os=-sysv + os=sysv ;; vms) basic_machine=vax-dec - os=-vms + os=vms ;; vpp*|vx|vx-*) basic_machine=f301-fujitsu ;; vxworks960) basic_machine=i960-wrs - os=-vxworks + os=vxworks ;; vxworks68) basic_machine=m68k-wrs - os=-vxworks + os=vxworks ;; vxworks29k) basic_machine=a29k-wrs - os=-vxworks + os=vxworks ;; w65*) basic_machine=w65-wdc - os=-none + os=none ;; w89k-*) basic_machine=hppa1.1-winbond - os=-proelf + os=proelf ;; x64) basic_machine=x86_64-pc ;; xbox) basic_machine=i686-pc - os=-mingw32 + os=mingw32 ;; xps | xps100) basic_machine=xps100-honeywell @@ -1283,11 +1282,11 @@ case $basic_machine in ;; ymp) basic_machine=ymp-cray - os=-unicos + os=unicos ;; none) basic_machine=none-none - os=-none + os=none ;; # Here we handle the default manufacturer of certain CPU types. It is in @@ -1365,196 +1364,194 @@ 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. - -auroraux) - os=-auroraux + # solaris* is a basic system type, with this one exception. + auroraux) + os=auroraux ;; - -solaris1 | -solaris1.*) + solaris1 | solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; - -solaris) - os=-solaris2 + solaris) + os=solaris2 ;; - -unixware*) - os=-sysv4.2uw + unixware*) + os=sysv4.2uw ;; - -gnu/linux*) + gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; # es1800 is here to avoid being matched by es* (a different OS) - -es1800*) - os=-ose + es1800*) + os=ose ;; # Now accept the basic system types. # The portable systems comes first. # Each alternative MUST end in a * to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* | -cloudabi* | -sortix* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \ - | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ - | -midnightbsd*) + # sysv* is not here because it comes later, after sysvr4. + gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | sco* | esix* | isc* | aix* | cnk* | sunos | sunos[34]*\ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | kopensolaris* | plan9* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | rtu* | xenix* \ + | hiux* | knetbsd* | mirbsd* | netbsd* \ + | bitrig* | openbsd* | solidbsd* | libertybsd* \ + | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusos* | chorusrdb* | cegcc* | glidix* \ + | cygwin* | msys* | pe* | psos* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \ + | linux-newlib* | linux-musl* | linux-uclibc* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* \ + | morphos* | superux* | rtmk* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; - -qnx*) + qnx*) case $basic_machine in x86-* | i*86-*) ;; *) - os=-nto$os + os=nto-$os ;; esac ;; - -nto-qnx*) + nto-qnx*) ;; - -nto*) + nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - -sim | -xray | -os68k* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + sim | xray | os68k* | v88r* \ + | windows* | osx | abug | netware* | os9* \ + | macos* | mpw* | magic* | mmixware* | mon960* | lnews*) ;; - -mac*) + mac*) os=`echo "$os" | sed -e 's|mac|macos|'` ;; - -linux-dietlibc) - os=-linux-dietlibc + linux-dietlibc) + os=linux-dietlibc ;; - -linux*) + linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; - -sunos5*) + sunos5*) os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; - -sunos6*) + sunos6*) os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; - -opened*) - os=-openedition + opened*) + os=openedition ;; - -os400*) - os=-os400 + os400*) + os=os400 ;; - -wince*) - os=-wince + wince*) + os=wince ;; - -utek*) - os=-bsd + utek*) + os=bsd ;; - -dynix*) - os=-bsd + dynix*) + os=bsd ;; - -acis*) - os=-aos + acis*) + os=aos ;; - -atheos*) - os=-atheos + atheos*) + os=atheos ;; - -syllable*) - os=-syllable + syllable*) + os=syllable ;; - -386bsd) - os=-bsd + 386bsd) + os=bsd ;; - -ctix* | -uts*) - os=-sysv + ctix* | uts*) + os=sysv ;; - -nova*) - os=-rtmk-nova + nova*) + os=rtmk-nova ;; - -ns2) - os=-nextstep2 + ns2) + os=nextstep2 ;; - -nsk*) - os=-nsk + nsk*) + os=nsk ;; # Preserve the version number of sinix5. - -sinix5.*) + sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` ;; - -sinix*) - os=-sysv4 + sinix*) + os=sysv4 ;; - -tpf*) - os=-tpf + tpf*) + os=tpf ;; - -triton*) - os=-sysv3 + triton*) + os=sysv3 ;; - -oss*) - os=-sysv3 + oss*) + os=sysv3 ;; - -svr4*) - os=-sysv4 + svr4*) + os=sysv4 ;; - -svr3) - os=-sysv3 + svr3) + os=sysv3 ;; - -sysvr4) - os=-sysv4 + sysvr4) + os=sysv4 ;; - # This must come after -sysvr4. - -sysv*) + # This must come after sysvr4. + sysv*) ;; - -ose*) - os=-ose + ose*) + os=ose ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint + *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + os=mint ;; - -zvmoe) - os=-zvmoe + zvmoe) + os=zvmoe ;; - -dicos*) - os=-dicos + dicos*) + os=dicos ;; - -pikeos*) + pikeos*) # Until real need of OS specific support for # particular features comes up, bare metal # configurations are quite functional. case $basic_machine in arm*) - os=-eabi + os=eabi ;; *) - os=-elf + os=elf ;; esac ;; - -nacl*) + nacl*) ;; - -ios) + ios) ;; - -none) + none) ;; - -*-eabi) + *-eabi) ;; *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; @@ -1573,173 +1570,173 @@ else case $basic_machine in score-*) - os=-elf + os=elf ;; spu-*) - os=-elf + os=elf ;; *-acorn) - os=-riscix1.2 + os=riscix1.2 ;; arm*-rebel) - os=-linux + os=linux ;; arm*-semi) - os=-aout + os=aout ;; c4x-* | tic4x-*) - os=-coff + os=coff ;; c8051-*) - os=-elf + os=elf ;; hexagon-*) - os=-elf + os=elf ;; tic54x-*) - os=-coff + os=coff ;; tic55x-*) - os=-coff + os=coff ;; tic6x-*) - os=-coff + os=coff ;; # This must come before the *-dec entry. pdp10-*) - os=-tops20 + os=tops20 ;; pdp11-*) - os=-none + os=none ;; *-dec | vax-*) - os=-ultrix4.2 + os=ultrix4.2 ;; m68*-apollo) - os=-domain + os=domain ;; i386-sun) - os=-sunos4.0.2 + os=sunos4.0.2 ;; m68000-sun) - os=-sunos3 + os=sunos3 ;; m68*-cisco) - os=-aout + os=aout ;; mep-*) - os=-elf + os=elf ;; mips*-cisco) - os=-elf + os=elf ;; mips*-*) - os=-elf + os=elf ;; or32-*) - os=-coff + os=coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 + os=sysv3 ;; sparc-* | *-sun) - os=-sunos4.1.1 + os=sunos4.1.1 ;; pru-*) - os=-elf + os=elf ;; *-be) - os=-beos + os=beos ;; *-ibm) - os=-aix + os=aix ;; *-knuth) - os=-mmixware + os=mmixware ;; *-wec) - os=-proelf + os=proelf ;; *-winbond) - os=-proelf + os=proelf ;; *-oki) - os=-proelf + os=proelf ;; *-hp) - os=-hpux + os=hpux ;; *-hitachi) - os=-hiux + os=hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv + os=sysv ;; *-cbm) - os=-amigaos + os=amigaos ;; *-dg) - os=-dgux + os=dgux ;; *-dolphin) - os=-sysv3 + os=sysv3 ;; m68k-ccur) - os=-rtu + os=rtu ;; m88k-omron*) - os=-luna + os=luna ;; *-next) - os=-nextstep + os=nextstep ;; *-sequent) - os=-ptx + os=ptx ;; *-crds) - os=-unos + os=unos ;; *-ns) - os=-genix + os=genix ;; i370-*) - os=-mvs + os=mvs ;; *-gould) - os=-sysv + os=sysv ;; *-highlevel) - os=-bsd + os=bsd ;; *-encore) - os=-bsd + os=bsd ;; *-sgi) - os=-irix + os=irix ;; *-siemens) - os=-sysv4 + os=sysv4 ;; *-masscomp) - os=-rtu + os=rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=-uxpv + os=uxpv ;; *-rom68k) - os=-coff + os=coff ;; *-*bug) - os=-coff + os=coff ;; *-apple) - os=-macos + os=macos ;; *-atari*) - os=-mint + os=mint ;; *) - os=-none + os=none ;; esac fi @@ -1750,67 +1747,67 @@ vendor=unknown case $basic_machine in *-unknown) case $os in - -riscix*) + riscix*) vendor=acorn ;; - -sunos*) + sunos*) vendor=sun ;; - -cnk*|-aix*) + cnk*|-aix*) vendor=ibm ;; - -beos*) + beos*) vendor=be ;; - -hpux*) + hpux*) vendor=hp ;; - -mpeix*) + mpeix*) vendor=hp ;; - -hiux*) + hiux*) vendor=hitachi ;; - -unos*) + unos*) vendor=crds ;; - -dgux*) + dgux*) vendor=dg ;; - -luna*) + luna*) vendor=omron ;; - -genix*) + genix*) vendor=ns ;; - -mvs* | -opened*) + mvs* | opened*) vendor=ibm ;; - -os400*) + os400*) vendor=ibm ;; - -ptx*) + ptx*) vendor=sequent ;; - -tpf*) + tpf*) vendor=ibm ;; - -vxsim* | -vxworks* | -windiss*) + vxsim* | vxworks* | windiss*) vendor=wrs ;; - -aux*) + aux*) vendor=apple ;; - -hms*) + hms*) vendor=hitachi ;; - -mpw* | -macos*) + mpw* | macos*) vendor=apple ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) vendor=atari ;; - -vos*) + vos*) vendor=stratus ;; esac @@ -1818,7 +1815,7 @@ case $basic_machine in ;; esac -echo "$basic_machine$os" +echo "$basic_machine-$os" exit # Local variables: diff --git a/Build/source/libs/icu/icu-src/source/config.sub b/Build/source/libs/icu/icu-src/source/config.sub index 98835b480d6..0b4a95027f8 100755 --- a/Build/source/libs/icu/icu-src/source/config.sub +++ b/Build/source/libs/icu/icu-src/source/config.sub @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-05-12' +timestamp='2018-05-14' # 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 @@ -117,9 +117,13 @@ EOF # Separate into logical components for further validation case $1 in + *-*-*-*-*) + echo Invalid configuration \`"$1"\': more than four components >&2 + exit 1 + ;; *-*-*-*) basic_machine=$field1-$field2 - os=-$field3-$field4 + os=$field3-$field4 ;; *-*-*) # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two @@ -132,21 +136,21 @@ case $1 in | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ | storm-chaos* | os2-emx* | rtmk-nova*) basic_machine=$field1 - os=-$maybe_os + os=$maybe_os ;; android-linux) basic_machine=$field1-unknown - os=-linux-android + os=linux-android ;; *) basic_machine=$field1-$field2 - os=-$field3 + os=$field3 ;; esac ;; *-*) basic_machine=$field1 - os=-$field2 + os=$field2 ;; *) basic_machine=$1 @@ -159,102 +163,102 @@ esac ### recognize some manufacturers as not being operating systems, so we ### can provide default operating systems below. case $os in - -sun*os*) + sun*os*) # Prevent following clause from handling this invalid input. ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -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 | -knuth | -cray | -microblaze*) + dec* | mips* | sequent* | encore* | pc532* | sgi* | sony* | \ + att* | 7300* | 3300* | delta* | motorola* | sun[234]* | \ + unicom* | ibm* | next | hp | isi* | apollo | altos* | \ + 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 | knuth | cray | microblaze*) os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + bluegene*) + os=cnk ;; - -sim | -cisco | -oki | -wec | -winbond) + sim | cisco | oki | wec | winbond) os= basic_machine=$1 ;; - -scout) + scout) ;; - -wrs) - os=-vxworks + wrs) + os=vxworks basic_machine=$1 ;; - -chorusos*) - os=-chorusos + chorusos*) + os=chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + chorusrdb) + os=chorusrdb basic_machine=$1 ;; - -hiux*) - os=-hiuxwe2 + hiux*) + os=hiuxwe2 ;; - -sco6) - os=-sco5v6 + sco6) + os=sco5v6 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco5) - os=-sco3.2v5 + sco5) + os=sco3.2v5 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco4) - os=-sco3.2v4 + sco4) + os=sco3.2v4 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco3.2.[4-9]*) + sco3.2.[4-9]*) os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco3.2v[4-9]*) + sco3.2v[4-9]*) # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco5v6*) + sco5v6*) # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco*) - os=-sco3.2v2 + sco*) + os=sco3.2v2 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -udk*) + udk*) basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -isc) - os=-isc2.2 + isc) + os=isc2.2 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -clix*) + clix*) basic_machine=clipper-intergraph ;; - -isc*) + isc*) basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -lynx*178) - os=-lynxos178 + lynx*178) + os=lynxos178 ;; - -lynx*5) - os=-lynxos5 + lynx*5) + os=lynxos5 ;; - -lynx*) - os=-lynxos + lynx*) + os=lynxos ;; - -ptx*) + ptx*) basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` ;; - -psos*) - os=-psos + psos*) + os=psos ;; - -mint | -mint[0-9]*) + mint | mint[0-9]*) basic_machine=m68k-atari - os=-mint + os=mint ;; esac @@ -352,13 +356,13 @@ case $basic_machine in ;; m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown - os=-none + os=none ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) ;; m9s12z | m68hcs12z | hcs12z | s12z) basic_machine=s12z-unknown - os=-none + os=none ;; ms1) basic_machine=mt-unknown @@ -369,7 +373,7 @@ case $basic_machine in ;; xgate) basic_machine=$basic_machine-unknown - os=-none + os=none ;; xscaleeb) basic_machine=armeb-unknown @@ -385,11 +389,6 @@ case $basic_machine in i*86 | x86_64) basic_machine=$basic_machine-pc ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 - exit 1 - ;; # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ @@ -484,7 +483,7 @@ case $basic_machine in # for a CPU type and a company and sometimes even an OS. 386bsd) basic_machine=i386-pc - os=-bsd + os=bsd ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) basic_machine=m68000-att @@ -494,14 +493,14 @@ case $basic_machine in ;; a29khif) basic_machine=a29k-amd - os=-udi + os=udi ;; abacus) basic_machine=abacus-unknown ;; adobe68k) basic_machine=m68010-adobe - os=-scout + os=scout ;; alliant | fx80) basic_machine=fx80-alliant @@ -511,7 +510,7 @@ case $basic_machine in ;; am29k) basic_machine=a29k-none - os=-bsd + os=bsd ;; amd64) basic_machine=x86_64-pc @@ -521,53 +520,53 @@ case $basic_machine in ;; amdahl) basic_machine=580-amdahl - os=-sysv + os=sysv ;; amiga | amiga-*) basic_machine=m68k-unknown ;; amigaos | amigados) basic_machine=m68k-unknown - os=-amigaos + os=amigaos ;; amigaunix | amix) basic_machine=m68k-unknown - os=-sysv4 + os=sysv4 ;; apollo68) basic_machine=m68k-apollo - os=-sysv + os=sysv ;; apollo68bsd) basic_machine=m68k-apollo - os=-bsd + os=bsd ;; aros) basic_machine=i386-pc - os=-aros + os=aros ;; asmjs) basic_machine=asmjs-unknown ;; aux) basic_machine=m68k-apple - os=-aux + os=aux ;; balance) basic_machine=ns32k-sequent - os=-dynix + os=dynix ;; blackfin) basic_machine=bfin-unknown - os=-linux + os=linux ;; blackfin-*) basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + os=linux ;; bluegene*) basic_machine=powerpc-ibm - os=-cnk + os=cnk ;; c54x-*) basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` @@ -580,43 +579,43 @@ case $basic_machine in ;; c90) basic_machine=c90-cray - os=-unicos + os=unicos ;; cegcc) basic_machine=arm-unknown - os=-cegcc + os=cegcc ;; convex-c1) basic_machine=c1-convex - os=-bsd + os=bsd ;; convex-c2) basic_machine=c2-convex - os=-bsd + os=bsd ;; convex-c32) basic_machine=c32-convex - os=-bsd + os=bsd ;; convex-c34) basic_machine=c34-convex - os=-bsd + os=bsd ;; convex-c38) basic_machine=c38-convex - os=-bsd + os=bsd ;; cray | j90) basic_machine=j90-cray - os=-unicos + os=unicos ;; craynv) basic_machine=craynv-cray - os=-unicosmp + os=unicosmp ;; cr16 | cr16-*) basic_machine=cr16-unknown - os=-elf + os=elf ;; crds | unos) basic_machine=m68k-crds @@ -629,7 +628,7 @@ case $basic_machine in ;; crx) basic_machine=crx-unknown - os=-elf + os=elf ;; da30 | da30-*) basic_machine=m68k-da30 @@ -639,11 +638,11 @@ case $basic_machine in ;; decsystem10* | dec10*) basic_machine=pdp10-dec - os=-tops10 + os=tops10 ;; decsystem20* | dec20*) basic_machine=pdp10-dec - os=-tops20 + os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) @@ -651,23 +650,23 @@ case $basic_machine in ;; delta88) basic_machine=m88k-motorola - os=-sysv3 + os=sysv3 ;; dicos) basic_machine=i686-pc - os=-dicos + os=dicos ;; djgpp) basic_machine=i586-pc - os=-msdosdjgpp + os=msdosdjgpp ;; dpx20 | dpx20-*) basic_machine=rs6000-bull - os=-bosx + os=bosx ;; dpx2*) basic_machine=m68k-bull - os=-sysv3 + os=sysv3 ;; e500v[12]) basic_machine=powerpc-unknown @@ -679,18 +678,18 @@ case $basic_machine in ;; ebmon29k) basic_machine=a29k-amd - os=-ebmon + os=ebmon ;; elxsi) basic_machine=elxsi-elxsi - os=-bsd + os=bsd ;; encore | umax | mmax) basic_machine=ns32k-encore ;; es1800 | OSE68k | ose68k | ose | OSE) basic_machine=m68k-ericsson - os=-ose + os=ose ;; fx2800) basic_machine=i860-alliant @@ -700,42 +699,42 @@ case $basic_machine in ;; gmicro) basic_machine=tron-gmicro - os=-sysv + os=sysv ;; go32) basic_machine=i386-pc - os=-go32 + os=go32 ;; h3050r* | hiux*) basic_machine=hppa1.1-hitachi - os=-hiuxwe2 + os=hiuxwe2 ;; h8300hms) basic_machine=h8300-hitachi - os=-hms + os=hms ;; h8300xray) basic_machine=h8300-hitachi - os=-xray + os=xray ;; h8500hms) basic_machine=h8500-hitachi - os=-hms + os=hms ;; harris) basic_machine=m88k-harris - os=-sysv3 + os=sysv3 ;; hp300-*) basic_machine=m68k-hp ;; hp300bsd) basic_machine=m68k-hp - os=-bsd + os=bsd ;; hp300hpux) basic_machine=m68k-hp - os=-hpux + os=hpux ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) basic_machine=hppa1.0-hp @@ -768,93 +767,93 @@ case $basic_machine in ;; hppaosf) basic_machine=hppa1.1-hp - os=-osf + os=osf ;; hppro) basic_machine=hppa1.1-hp - os=-proelf + os=proelf ;; i370-ibm* | ibm*) basic_machine=i370-ibm ;; i*86v32) basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv32 + os=sysv32 ;; i*86v4*) basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv4 + os=sysv4 ;; i*86v) basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv + os=sysv ;; i*86sol2) basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-solaris2 + os=solaris2 ;; i386mach) basic_machine=i386-mach - os=-mach + os=mach ;; vsta) basic_machine=i386-unknown - os=-vsta + os=vsta ;; iris | iris4d) basic_machine=mips-sgi case $os in - -irix*) + irix*) ;; *) - os=-irix4 + os=irix4 ;; esac ;; isi68 | isi) basic_machine=m68k-isi - os=-sysv + os=sysv ;; leon-*|leon[3-9]-*) basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` ;; m68knommu) basic_machine=m68k-unknown - os=-linux + os=linux ;; m68knommu-*) basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + os=linux ;; magnum | m3230) basic_machine=mips-mips - os=-sysv + os=sysv ;; merlin) basic_machine=ns32k-utek - os=-sysv + os=sysv ;; microblaze*) basic_machine=microblaze-xilinx ;; mingw64) basic_machine=x86_64-pc - os=-mingw64 + os=mingw64 ;; mingw32) basic_machine=i686-pc - os=-mingw32 + os=mingw32 ;; mingw32ce) basic_machine=arm-unknown - os=-mingw32ce + os=mingw32ce ;; miniframe) basic_machine=m68000-convergent ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) basic_machine=m68k-atari - os=-mint + os=mint ;; mips3*-*) basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` @@ -864,95 +863,95 @@ case $basic_machine in ;; monitor) basic_machine=m68k-rom68k - os=-coff + os=coff ;; morphos) basic_machine=powerpc-unknown - os=-morphos + os=morphos ;; moxiebox) basic_machine=moxie-unknown - os=-moxiebox + os=moxiebox ;; msdos) basic_machine=i386-pc - os=-msdos + os=msdos ;; ms1-*) basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` ;; msys) basic_machine=i686-pc - os=-msys + os=msys ;; mvs) basic_machine=i370-ibm - os=-mvs + os=mvs ;; nacl) basic_machine=le32-unknown - os=-nacl + os=nacl ;; ncr3000) basic_machine=i486-ncr - os=-sysv4 + os=sysv4 ;; netbsd386) basic_machine=i386-unknown - os=-netbsd + os=netbsd ;; netwinder) basic_machine=armv4l-rebel - os=-linux + os=linux ;; news | news700 | news800 | news900) basic_machine=m68k-sony - os=-newsos + os=newsos ;; news1000) basic_machine=m68030-sony - os=-newsos + os=newsos ;; news-3600 | risc-news) basic_machine=mips-sony - os=-newsos + os=newsos ;; necv70) basic_machine=v70-nec - os=-sysv + os=sysv ;; next | m*-next) basic_machine=m68k-next case $os in - -nextstep* ) + nextstep* ) ;; - -ns2*) - os=-nextstep2 + ns2*) + os=nextstep2 ;; *) - os=-nextstep3 + os=nextstep3 ;; esac ;; nh3000) basic_machine=m68k-harris - os=-cxux + os=cxux ;; nh[45]000) basic_machine=m88k-harris - os=-cxux + os=cxux ;; nindy960) basic_machine=i960-intel - os=-nindy + os=nindy ;; mon960) basic_machine=i960-intel - os=-mon960 + os=mon960 ;; nonstopux) basic_machine=mips-compaq - os=-nonstopux + os=nonstopux ;; np1) basic_machine=np1-gould @@ -974,38 +973,38 @@ case $basic_machine in ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki - os=-proelf + os=proelf ;; openrisc | openrisc-*) basic_machine=or32-unknown ;; os400) basic_machine=powerpc-ibm - os=-os400 + os=os400 ;; OSE68000 | ose68000) basic_machine=m68000-ericsson - os=-ose + os=ose ;; os68k) basic_machine=m68k-none - os=-os68k + os=os68k ;; pa-hitachi) basic_machine=hppa1.1-hitachi - os=-hiuxwe2 + os=hiuxwe2 ;; paragon) basic_machine=i860-intel - os=-osf + os=osf ;; parisc) basic_machine=hppa-unknown - os=-linux + os=linux ;; parisc-*) basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + os=linux ;; pbd) basic_machine=sparc-tti @@ -1077,19 +1076,19 @@ case $basic_machine in ;; pw32) basic_machine=i586-unknown - os=-pw32 + os=pw32 ;; rdos | rdos64) basic_machine=x86_64-pc - os=-rdos + os=rdos ;; rdos32) basic_machine=i386-pc - os=-rdos + os=rdos ;; rom68k) basic_machine=m68k-rom68k - os=-coff + os=coff ;; rm[46]00) basic_machine=mips-siemens @@ -1105,7 +1104,7 @@ case $basic_machine in ;; sa29200) basic_machine=a29k-amd - os=-udi + os=udi ;; sb1) basic_machine=mipsisa64sb1-unknown @@ -1115,11 +1114,11 @@ case $basic_machine in ;; sde) basic_machine=mipsisa32-sde - os=-elf + os=elf ;; sei) basic_machine=mips-sei - os=-seiux + os=seiux ;; sequent) basic_machine=i386-sequent @@ -1129,11 +1128,11 @@ case $basic_machine in ;; simso-wrs) basic_machine=sparclite-wrs - os=-vxworks + os=vxworks ;; sps7) basic_machine=m68k-bull - os=-sysv2 + os=sysv2 ;; spur) basic_machine=spur-unknown @@ -1143,7 +1142,7 @@ case $basic_machine in ;; stratus) basic_machine=i860-stratus - os=-sysv4 + os=sysv4 ;; strongarm-* | thumb-*) basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` @@ -1153,31 +1152,31 @@ case $basic_machine in ;; sun2os3) basic_machine=m68000-sun - os=-sunos3 + os=sunos3 ;; sun2os4) basic_machine=m68000-sun - os=-sunos4 + os=sunos4 ;; sun3os3) basic_machine=m68k-sun - os=-sunos3 + os=sunos3 ;; sun3os4) basic_machine=m68k-sun - os=-sunos4 + os=sunos4 ;; sun4os3) basic_machine=sparc-sun - os=-sunos3 + os=sunos3 ;; sun4os4) basic_machine=sparc-sun - os=-sunos4 + os=sunos4 ;; sun4sol2) basic_machine=sparc-sun - os=-solaris2 + os=solaris2 ;; sun3 | sun3-*) basic_machine=m68k-sun @@ -1190,23 +1189,23 @@ case $basic_machine in ;; sv1) basic_machine=sv1-cray - os=-unicos + os=unicos ;; symmetry) basic_machine=i386-sequent - os=-dynix + os=dynix ;; t3e) basic_machine=alphaev5-cray - os=-unicos + os=unicos ;; t90) basic_machine=t90-cray - os=-unicos + os=unicos ;; tile*) basic_machine=$basic_machine-unknown - os=-linux-gnu + os=linux-gnu ;; tx39) basic_machine=mipstx39-unknown @@ -1216,64 +1215,64 @@ case $basic_machine in ;; toad1) basic_machine=pdp10-xkl - os=-tops20 + os=tops20 ;; tower | tower-32) basic_machine=m68k-ncr ;; tpf) basic_machine=s390x-ibm - os=-tpf + os=tpf ;; udi29k) basic_machine=a29k-amd - os=-udi + os=udi ;; ultra3) basic_machine=a29k-nyu - os=-sym1 + os=sym1 ;; v810 | necv810) basic_machine=v810-nec - os=-none + os=none ;; vaxv) basic_machine=vax-dec - os=-sysv + os=sysv ;; vms) basic_machine=vax-dec - os=-vms + os=vms ;; vpp*|vx|vx-*) basic_machine=f301-fujitsu ;; vxworks960) basic_machine=i960-wrs - os=-vxworks + os=vxworks ;; vxworks68) basic_machine=m68k-wrs - os=-vxworks + os=vxworks ;; vxworks29k) basic_machine=a29k-wrs - os=-vxworks + os=vxworks ;; w65*) basic_machine=w65-wdc - os=-none + os=none ;; w89k-*) basic_machine=hppa1.1-winbond - os=-proelf + os=proelf ;; x64) basic_machine=x86_64-pc ;; xbox) basic_machine=i686-pc - os=-mingw32 + os=mingw32 ;; xps | xps100) basic_machine=xps100-honeywell @@ -1283,11 +1282,11 @@ case $basic_machine in ;; ymp) basic_machine=ymp-cray - os=-unicos + os=unicos ;; none) basic_machine=none-none - os=-none + os=none ;; # Here we handle the default manufacturer of certain CPU types. It is in @@ -1365,196 +1364,194 @@ 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. - -auroraux) - os=-auroraux + # solaris* is a basic system type, with this one exception. + auroraux) + os=auroraux ;; - -solaris1 | -solaris1.*) + solaris1 | solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; - -solaris) - os=-solaris2 + solaris) + os=solaris2 ;; - -unixware*) - os=-sysv4.2uw + unixware*) + os=sysv4.2uw ;; - -gnu/linux*) + gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; # es1800 is here to avoid being matched by es* (a different OS) - -es1800*) - os=-ose + es1800*) + os=ose ;; # Now accept the basic system types. # The portable systems comes first. # Each alternative MUST end in a * to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* | -cloudabi* | -sortix* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \ - | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ - | -midnightbsd*) + # sysv* is not here because it comes later, after sysvr4. + gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | sco* | esix* | isc* | aix* | cnk* | sunos | sunos[34]*\ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | kopensolaris* | plan9* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | rtu* | xenix* \ + | hiux* | knetbsd* | mirbsd* | netbsd* \ + | bitrig* | openbsd* | solidbsd* | libertybsd* \ + | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusos* | chorusrdb* | cegcc* | glidix* \ + | cygwin* | msys* | pe* | psos* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \ + | linux-newlib* | linux-musl* | linux-uclibc* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* \ + | morphos* | superux* | rtmk* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; - -qnx*) + qnx*) case $basic_machine in x86-* | i*86-*) ;; *) - os=-nto$os + os=nto-$os ;; esac ;; - -nto-qnx*) + nto-qnx*) ;; - -nto*) + nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - -sim | -xray | -os68k* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + sim | xray | os68k* | v88r* \ + | windows* | osx | abug | netware* | os9* \ + | macos* | mpw* | magic* | mmixware* | mon960* | lnews*) ;; - -mac*) + mac*) os=`echo "$os" | sed -e 's|mac|macos|'` ;; - -linux-dietlibc) - os=-linux-dietlibc + linux-dietlibc) + os=linux-dietlibc ;; - -linux*) + linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; - -sunos5*) + sunos5*) os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; - -sunos6*) + sunos6*) os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; - -opened*) - os=-openedition + opened*) + os=openedition ;; - -os400*) - os=-os400 + os400*) + os=os400 ;; - -wince*) - os=-wince + wince*) + os=wince ;; - -utek*) - os=-bsd + utek*) + os=bsd ;; - -dynix*) - os=-bsd + dynix*) + os=bsd ;; - -acis*) - os=-aos + acis*) + os=aos ;; - -atheos*) - os=-atheos + atheos*) + os=atheos ;; - -syllable*) - os=-syllable + syllable*) + os=syllable ;; - -386bsd) - os=-bsd + 386bsd) + os=bsd ;; - -ctix* | -uts*) - os=-sysv + ctix* | uts*) + os=sysv ;; - -nova*) - os=-rtmk-nova + nova*) + os=rtmk-nova ;; - -ns2) - os=-nextstep2 + ns2) + os=nextstep2 ;; - -nsk*) - os=-nsk + nsk*) + os=nsk ;; # Preserve the version number of sinix5. - -sinix5.*) + sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` ;; - -sinix*) - os=-sysv4 + sinix*) + os=sysv4 ;; - -tpf*) - os=-tpf + tpf*) + os=tpf ;; - -triton*) - os=-sysv3 + triton*) + os=sysv3 ;; - -oss*) - os=-sysv3 + oss*) + os=sysv3 ;; - -svr4*) - os=-sysv4 + svr4*) + os=sysv4 ;; - -svr3) - os=-sysv3 + svr3) + os=sysv3 ;; - -sysvr4) - os=-sysv4 + sysvr4) + os=sysv4 ;; - # This must come after -sysvr4. - -sysv*) + # This must come after sysvr4. + sysv*) ;; - -ose*) - os=-ose + ose*) + os=ose ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint + *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + os=mint ;; - -zvmoe) - os=-zvmoe + zvmoe) + os=zvmoe ;; - -dicos*) - os=-dicos + dicos*) + os=dicos ;; - -pikeos*) + pikeos*) # Until real need of OS specific support for # particular features comes up, bare metal # configurations are quite functional. case $basic_machine in arm*) - os=-eabi + os=eabi ;; *) - os=-elf + os=elf ;; esac ;; - -nacl*) + nacl*) ;; - -ios) + ios) ;; - -none) + none) ;; - -*-eabi) + *-eabi) ;; *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; @@ -1573,173 +1570,173 @@ else case $basic_machine in score-*) - os=-elf + os=elf ;; spu-*) - os=-elf + os=elf ;; *-acorn) - os=-riscix1.2 + os=riscix1.2 ;; arm*-rebel) - os=-linux + os=linux ;; arm*-semi) - os=-aout + os=aout ;; c4x-* | tic4x-*) - os=-coff + os=coff ;; c8051-*) - os=-elf + os=elf ;; hexagon-*) - os=-elf + os=elf ;; tic54x-*) - os=-coff + os=coff ;; tic55x-*) - os=-coff + os=coff ;; tic6x-*) - os=-coff + os=coff ;; # This must come before the *-dec entry. pdp10-*) - os=-tops20 + os=tops20 ;; pdp11-*) - os=-none + os=none ;; *-dec | vax-*) - os=-ultrix4.2 + os=ultrix4.2 ;; m68*-apollo) - os=-domain + os=domain ;; i386-sun) - os=-sunos4.0.2 + os=sunos4.0.2 ;; m68000-sun) - os=-sunos3 + os=sunos3 ;; m68*-cisco) - os=-aout + os=aout ;; mep-*) - os=-elf + os=elf ;; mips*-cisco) - os=-elf + os=elf ;; mips*-*) - os=-elf + os=elf ;; or32-*) - os=-coff + os=coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 + os=sysv3 ;; sparc-* | *-sun) - os=-sunos4.1.1 + os=sunos4.1.1 ;; pru-*) - os=-elf + os=elf ;; *-be) - os=-beos + os=beos ;; *-ibm) - os=-aix + os=aix ;; *-knuth) - os=-mmixware + os=mmixware ;; *-wec) - os=-proelf + os=proelf ;; *-winbond) - os=-proelf + os=proelf ;; *-oki) - os=-proelf + os=proelf ;; *-hp) - os=-hpux + os=hpux ;; *-hitachi) - os=-hiux + os=hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv + os=sysv ;; *-cbm) - os=-amigaos + os=amigaos ;; *-dg) - os=-dgux + os=dgux ;; *-dolphin) - os=-sysv3 + os=sysv3 ;; m68k-ccur) - os=-rtu + os=rtu ;; m88k-omron*) - os=-luna + os=luna ;; *-next) - os=-nextstep + os=nextstep ;; *-sequent) - os=-ptx + os=ptx ;; *-crds) - os=-unos + os=unos ;; *-ns) - os=-genix + os=genix ;; i370-*) - os=-mvs + os=mvs ;; *-gould) - os=-sysv + os=sysv ;; *-highlevel) - os=-bsd + os=bsd ;; *-encore) - os=-bsd + os=bsd ;; *-sgi) - os=-irix + os=irix ;; *-siemens) - os=-sysv4 + os=sysv4 ;; *-masscomp) - os=-rtu + os=rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=-uxpv + os=uxpv ;; *-rom68k) - os=-coff + os=coff ;; *-*bug) - os=-coff + os=coff ;; *-apple) - os=-macos + os=macos ;; *-atari*) - os=-mint + os=mint ;; *) - os=-none + os=none ;; esac fi @@ -1750,67 +1747,67 @@ vendor=unknown case $basic_machine in *-unknown) case $os in - -riscix*) + riscix*) vendor=acorn ;; - -sunos*) + sunos*) vendor=sun ;; - -cnk*|-aix*) + cnk*|-aix*) vendor=ibm ;; - -beos*) + beos*) vendor=be ;; - -hpux*) + hpux*) vendor=hp ;; - -mpeix*) + mpeix*) vendor=hp ;; - -hiux*) + hiux*) vendor=hitachi ;; - -unos*) + unos*) vendor=crds ;; - -dgux*) + dgux*) vendor=dg ;; - -luna*) + luna*) vendor=omron ;; - -genix*) + genix*) vendor=ns ;; - -mvs* | -opened*) + mvs* | opened*) vendor=ibm ;; - -os400*) + os400*) vendor=ibm ;; - -ptx*) + ptx*) vendor=sequent ;; - -tpf*) + tpf*) vendor=ibm ;; - -vxsim* | -vxworks* | -windiss*) + vxsim* | vxworks* | windiss*) vendor=wrs ;; - -aux*) + aux*) vendor=apple ;; - -hms*) + hms*) vendor=hitachi ;; - -mpw* | -macos*) + mpw* | macos*) vendor=apple ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) vendor=atari ;; - -vos*) + vos*) vendor=stratus ;; esac @@ -1818,7 +1815,7 @@ case $basic_machine in ;; esac -echo "$basic_machine$os" +echo "$basic_machine-$os" exit # Local variables: diff --git a/Build/source/utils/asymptote/config.sub b/Build/source/utils/asymptote/config.sub index 98835b480d6..0b4a95027f8 100755 --- a/Build/source/utils/asymptote/config.sub +++ b/Build/source/utils/asymptote/config.sub @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-05-12' +timestamp='2018-05-14' # 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 @@ -117,9 +117,13 @@ EOF # Separate into logical components for further validation case $1 in + *-*-*-*-*) + echo Invalid configuration \`"$1"\': more than four components >&2 + exit 1 + ;; *-*-*-*) basic_machine=$field1-$field2 - os=-$field3-$field4 + os=$field3-$field4 ;; *-*-*) # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two @@ -132,21 +136,21 @@ case $1 in | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ | storm-chaos* | os2-emx* | rtmk-nova*) basic_machine=$field1 - os=-$maybe_os + os=$maybe_os ;; android-linux) basic_machine=$field1-unknown - os=-linux-android + os=linux-android ;; *) basic_machine=$field1-$field2 - os=-$field3 + os=$field3 ;; esac ;; *-*) basic_machine=$field1 - os=-$field2 + os=$field2 ;; *) basic_machine=$1 @@ -159,102 +163,102 @@ esac ### recognize some manufacturers as not being operating systems, so we ### can provide default operating systems below. case $os in - -sun*os*) + sun*os*) # Prevent following clause from handling this invalid input. ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -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 | -knuth | -cray | -microblaze*) + dec* | mips* | sequent* | encore* | pc532* | sgi* | sony* | \ + att* | 7300* | 3300* | delta* | motorola* | sun[234]* | \ + unicom* | ibm* | next | hp | isi* | apollo | altos* | \ + 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 | knuth | cray | microblaze*) os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + bluegene*) + os=cnk ;; - -sim | -cisco | -oki | -wec | -winbond) + sim | cisco | oki | wec | winbond) os= basic_machine=$1 ;; - -scout) + scout) ;; - -wrs) - os=-vxworks + wrs) + os=vxworks basic_machine=$1 ;; - -chorusos*) - os=-chorusos + chorusos*) + os=chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + chorusrdb) + os=chorusrdb basic_machine=$1 ;; - -hiux*) - os=-hiuxwe2 + hiux*) + os=hiuxwe2 ;; - -sco6) - os=-sco5v6 + sco6) + os=sco5v6 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco5) - os=-sco3.2v5 + sco5) + os=sco3.2v5 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco4) - os=-sco3.2v4 + sco4) + os=sco3.2v4 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco3.2.[4-9]*) + sco3.2.[4-9]*) os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco3.2v[4-9]*) + sco3.2v[4-9]*) # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco5v6*) + sco5v6*) # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -sco*) - os=-sco3.2v2 + sco*) + os=sco3.2v2 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -udk*) + udk*) basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -isc) - os=-isc2.2 + isc) + os=isc2.2 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -clix*) + clix*) basic_machine=clipper-intergraph ;; - -isc*) + isc*) basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - -lynx*178) - os=-lynxos178 + lynx*178) + os=lynxos178 ;; - -lynx*5) - os=-lynxos5 + lynx*5) + os=lynxos5 ;; - -lynx*) - os=-lynxos + lynx*) + os=lynxos ;; - -ptx*) + ptx*) basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` ;; - -psos*) - os=-psos + psos*) + os=psos ;; - -mint | -mint[0-9]*) + mint | mint[0-9]*) basic_machine=m68k-atari - os=-mint + os=mint ;; esac @@ -352,13 +356,13 @@ case $basic_machine in ;; m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown - os=-none + os=none ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) ;; m9s12z | m68hcs12z | hcs12z | s12z) basic_machine=s12z-unknown - os=-none + os=none ;; ms1) basic_machine=mt-unknown @@ -369,7 +373,7 @@ case $basic_machine in ;; xgate) basic_machine=$basic_machine-unknown - os=-none + os=none ;; xscaleeb) basic_machine=armeb-unknown @@ -385,11 +389,6 @@ case $basic_machine in i*86 | x86_64) basic_machine=$basic_machine-pc ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 - exit 1 - ;; # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ @@ -484,7 +483,7 @@ case $basic_machine in # for a CPU type and a company and sometimes even an OS. 386bsd) basic_machine=i386-pc - os=-bsd + os=bsd ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) basic_machine=m68000-att @@ -494,14 +493,14 @@ case $basic_machine in ;; a29khif) basic_machine=a29k-amd - os=-udi + os=udi ;; abacus) basic_machine=abacus-unknown ;; adobe68k) basic_machine=m68010-adobe - os=-scout + os=scout ;; alliant | fx80) basic_machine=fx80-alliant @@ -511,7 +510,7 @@ case $basic_machine in ;; am29k) basic_machine=a29k-none - os=-bsd + os=bsd ;; amd64) basic_machine=x86_64-pc @@ -521,53 +520,53 @@ case $basic_machine in ;; amdahl) basic_machine=580-amdahl - os=-sysv + os=sysv ;; amiga | amiga-*) basic_machine=m68k-unknown ;; amigaos | amigados) basic_machine=m68k-unknown - os=-amigaos + os=amigaos ;; amigaunix | amix) basic_machine=m68k-unknown - os=-sysv4 + os=sysv4 ;; apollo68) basic_machine=m68k-apollo - os=-sysv + os=sysv ;; apollo68bsd) basic_machine=m68k-apollo - os=-bsd + os=bsd ;; aros) basic_machine=i386-pc - os=-aros + os=aros ;; asmjs) basic_machine=asmjs-unknown ;; aux) basic_machine=m68k-apple - os=-aux + os=aux ;; balance) basic_machine=ns32k-sequent - os=-dynix + os=dynix ;; blackfin) basic_machine=bfin-unknown - os=-linux + os=linux ;; blackfin-*) basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + os=linux ;; bluegene*) basic_machine=powerpc-ibm - os=-cnk + os=cnk ;; c54x-*) basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` @@ -580,43 +579,43 @@ case $basic_machine in ;; c90) basic_machine=c90-cray - os=-unicos + os=unicos ;; cegcc) basic_machine=arm-unknown - os=-cegcc + os=cegcc ;; convex-c1) basic_machine=c1-convex - os=-bsd + os=bsd ;; convex-c2) basic_machine=c2-convex - os=-bsd + os=bsd ;; convex-c32) basic_machine=c32-convex - os=-bsd + os=bsd ;; convex-c34) basic_machine=c34-convex - os=-bsd + os=bsd ;; convex-c38) basic_machine=c38-convex - os=-bsd + os=bsd ;; cray | j90) basic_machine=j90-cray - os=-unicos + os=unicos ;; craynv) basic_machine=craynv-cray - os=-unicosmp + os=unicosmp ;; cr16 | cr16-*) basic_machine=cr16-unknown - os=-elf + os=elf ;; crds | unos) basic_machine=m68k-crds @@ -629,7 +628,7 @@ case $basic_machine in ;; crx) basic_machine=crx-unknown - os=-elf + os=elf ;; da30 | da30-*) basic_machine=m68k-da30 @@ -639,11 +638,11 @@ case $basic_machine in ;; decsystem10* | dec10*) basic_machine=pdp10-dec - os=-tops10 + os=tops10 ;; decsystem20* | dec20*) basic_machine=pdp10-dec - os=-tops20 + os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) @@ -651,23 +650,23 @@ case $basic_machine in ;; delta88) basic_machine=m88k-motorola - os=-sysv3 + os=sysv3 ;; dicos) basic_machine=i686-pc - os=-dicos + os=dicos ;; djgpp) basic_machine=i586-pc - os=-msdosdjgpp + os=msdosdjgpp ;; dpx20 | dpx20-*) basic_machine=rs6000-bull - os=-bosx + os=bosx ;; dpx2*) basic_machine=m68k-bull - os=-sysv3 + os=sysv3 ;; e500v[12]) basic_machine=powerpc-unknown @@ -679,18 +678,18 @@ case $basic_machine in ;; ebmon29k) basic_machine=a29k-amd - os=-ebmon + os=ebmon ;; elxsi) basic_machine=elxsi-elxsi - os=-bsd + os=bsd ;; encore | umax | mmax) basic_machine=ns32k-encore ;; es1800 | OSE68k | ose68k | ose | OSE) basic_machine=m68k-ericsson - os=-ose + os=ose ;; fx2800) basic_machine=i860-alliant @@ -700,42 +699,42 @@ case $basic_machine in ;; gmicro) basic_machine=tron-gmicro - os=-sysv + os=sysv ;; go32) basic_machine=i386-pc - os=-go32 + os=go32 ;; h3050r* | hiux*) basic_machine=hppa1.1-hitachi - os=-hiuxwe2 + os=hiuxwe2 ;; h8300hms) basic_machine=h8300-hitachi - os=-hms + os=hms ;; h8300xray) basic_machine=h8300-hitachi - os=-xray + os=xray ;; h8500hms) basic_machine=h8500-hitachi - os=-hms + os=hms ;; harris) basic_machine=m88k-harris - os=-sysv3 + os=sysv3 ;; hp300-*) basic_machine=m68k-hp ;; hp300bsd) basic_machine=m68k-hp - os=-bsd + os=bsd ;; hp300hpux) basic_machine=m68k-hp - os=-hpux + os=hpux ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) basic_machine=hppa1.0-hp @@ -768,93 +767,93 @@ case $basic_machine in ;; hppaosf) basic_machine=hppa1.1-hp - os=-osf + os=osf ;; hppro) basic_machine=hppa1.1-hp - os=-proelf + os=proelf ;; i370-ibm* | ibm*) basic_machine=i370-ibm ;; i*86v32) basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv32 + os=sysv32 ;; i*86v4*) basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv4 + os=sysv4 ;; i*86v) basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv + os=sysv ;; i*86sol2) basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-solaris2 + os=solaris2 ;; i386mach) basic_machine=i386-mach - os=-mach + os=mach ;; vsta) basic_machine=i386-unknown - os=-vsta + os=vsta ;; iris | iris4d) basic_machine=mips-sgi case $os in - -irix*) + irix*) ;; *) - os=-irix4 + os=irix4 ;; esac ;; isi68 | isi) basic_machine=m68k-isi - os=-sysv + os=sysv ;; leon-*|leon[3-9]-*) basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` ;; m68knommu) basic_machine=m68k-unknown - os=-linux + os=linux ;; m68knommu-*) basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + os=linux ;; magnum | m3230) basic_machine=mips-mips - os=-sysv + os=sysv ;; merlin) basic_machine=ns32k-utek - os=-sysv + os=sysv ;; microblaze*) basic_machine=microblaze-xilinx ;; mingw64) basic_machine=x86_64-pc - os=-mingw64 + os=mingw64 ;; mingw32) basic_machine=i686-pc - os=-mingw32 + os=mingw32 ;; mingw32ce) basic_machine=arm-unknown - os=-mingw32ce + os=mingw32ce ;; miniframe) basic_machine=m68000-convergent ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) basic_machine=m68k-atari - os=-mint + os=mint ;; mips3*-*) basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` @@ -864,95 +863,95 @@ case $basic_machine in ;; monitor) basic_machine=m68k-rom68k - os=-coff + os=coff ;; morphos) basic_machine=powerpc-unknown - os=-morphos + os=morphos ;; moxiebox) basic_machine=moxie-unknown - os=-moxiebox + os=moxiebox ;; msdos) basic_machine=i386-pc - os=-msdos + os=msdos ;; ms1-*) basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` ;; msys) basic_machine=i686-pc - os=-msys + os=msys ;; mvs) basic_machine=i370-ibm - os=-mvs + os=mvs ;; nacl) basic_machine=le32-unknown - os=-nacl + os=nacl ;; ncr3000) basic_machine=i486-ncr - os=-sysv4 + os=sysv4 ;; netbsd386) basic_machine=i386-unknown - os=-netbsd + os=netbsd ;; netwinder) basic_machine=armv4l-rebel - os=-linux + os=linux ;; news | news700 | news800 | news900) basic_machine=m68k-sony - os=-newsos + os=newsos ;; news1000) basic_machine=m68030-sony - os=-newsos + os=newsos ;; news-3600 | risc-news) basic_machine=mips-sony - os=-newsos + os=newsos ;; necv70) basic_machine=v70-nec - os=-sysv + os=sysv ;; next | m*-next) basic_machine=m68k-next case $os in - -nextstep* ) + nextstep* ) ;; - -ns2*) - os=-nextstep2 + ns2*) + os=nextstep2 ;; *) - os=-nextstep3 + os=nextstep3 ;; esac ;; nh3000) basic_machine=m68k-harris - os=-cxux + os=cxux ;; nh[45]000) basic_machine=m88k-harris - os=-cxux + os=cxux ;; nindy960) basic_machine=i960-intel - os=-nindy + os=nindy ;; mon960) basic_machine=i960-intel - os=-mon960 + os=mon960 ;; nonstopux) basic_machine=mips-compaq - os=-nonstopux + os=nonstopux ;; np1) basic_machine=np1-gould @@ -974,38 +973,38 @@ case $basic_machine in ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki - os=-proelf + os=proelf ;; openrisc | openrisc-*) basic_machine=or32-unknown ;; os400) basic_machine=powerpc-ibm - os=-os400 + os=os400 ;; OSE68000 | ose68000) basic_machine=m68000-ericsson - os=-ose + os=ose ;; os68k) basic_machine=m68k-none - os=-os68k + os=os68k ;; pa-hitachi) basic_machine=hppa1.1-hitachi - os=-hiuxwe2 + os=hiuxwe2 ;; paragon) basic_machine=i860-intel - os=-osf + os=osf ;; parisc) basic_machine=hppa-unknown - os=-linux + os=linux ;; parisc-*) basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + os=linux ;; pbd) basic_machine=sparc-tti @@ -1077,19 +1076,19 @@ case $basic_machine in ;; pw32) basic_machine=i586-unknown - os=-pw32 + os=pw32 ;; rdos | rdos64) basic_machine=x86_64-pc - os=-rdos + os=rdos ;; rdos32) basic_machine=i386-pc - os=-rdos + os=rdos ;; rom68k) basic_machine=m68k-rom68k - os=-coff + os=coff ;; rm[46]00) basic_machine=mips-siemens @@ -1105,7 +1104,7 @@ case $basic_machine in ;; sa29200) basic_machine=a29k-amd - os=-udi + os=udi ;; sb1) basic_machine=mipsisa64sb1-unknown @@ -1115,11 +1114,11 @@ case $basic_machine in ;; sde) basic_machine=mipsisa32-sde - os=-elf + os=elf ;; sei) basic_machine=mips-sei - os=-seiux + os=seiux ;; sequent) basic_machine=i386-sequent @@ -1129,11 +1128,11 @@ case $basic_machine in ;; simso-wrs) basic_machine=sparclite-wrs - os=-vxworks + os=vxworks ;; sps7) basic_machine=m68k-bull - os=-sysv2 + os=sysv2 ;; spur) basic_machine=spur-unknown @@ -1143,7 +1142,7 @@ case $basic_machine in ;; stratus) basic_machine=i860-stratus - os=-sysv4 + os=sysv4 ;; strongarm-* | thumb-*) basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` @@ -1153,31 +1152,31 @@ case $basic_machine in ;; sun2os3) basic_machine=m68000-sun - os=-sunos3 + os=sunos3 ;; sun2os4) basic_machine=m68000-sun - os=-sunos4 + os=sunos4 ;; sun3os3) basic_machine=m68k-sun - os=-sunos3 + os=sunos3 ;; sun3os4) basic_machine=m68k-sun - os=-sunos4 + os=sunos4 ;; sun4os3) basic_machine=sparc-sun - os=-sunos3 + os=sunos3 ;; sun4os4) basic_machine=sparc-sun - os=-sunos4 + os=sunos4 ;; sun4sol2) basic_machine=sparc-sun - os=-solaris2 + os=solaris2 ;; sun3 | sun3-*) basic_machine=m68k-sun @@ -1190,23 +1189,23 @@ case $basic_machine in ;; sv1) basic_machine=sv1-cray - os=-unicos + os=unicos ;; symmetry) basic_machine=i386-sequent - os=-dynix + os=dynix ;; t3e) basic_machine=alphaev5-cray - os=-unicos + os=unicos ;; t90) basic_machine=t90-cray - os=-unicos + os=unicos ;; tile*) basic_machine=$basic_machine-unknown - os=-linux-gnu + os=linux-gnu ;; tx39) basic_machine=mipstx39-unknown @@ -1216,64 +1215,64 @@ case $basic_machine in ;; toad1) basic_machine=pdp10-xkl - os=-tops20 + os=tops20 ;; tower | tower-32) basic_machine=m68k-ncr ;; tpf) basic_machine=s390x-ibm - os=-tpf + os=tpf ;; udi29k) basic_machine=a29k-amd - os=-udi + os=udi ;; ultra3) basic_machine=a29k-nyu - os=-sym1 + os=sym1 ;; v810 | necv810) basic_machine=v810-nec - os=-none + os=none ;; vaxv) basic_machine=vax-dec - os=-sysv + os=sysv ;; vms) basic_machine=vax-dec - os=-vms + os=vms ;; vpp*|vx|vx-*) basic_machine=f301-fujitsu ;; vxworks960) basic_machine=i960-wrs - os=-vxworks + os=vxworks ;; vxworks68) basic_machine=m68k-wrs - os=-vxworks + os=vxworks ;; vxworks29k) basic_machine=a29k-wrs - os=-vxworks + os=vxworks ;; w65*) basic_machine=w65-wdc - os=-none + os=none ;; w89k-*) basic_machine=hppa1.1-winbond - os=-proelf + os=proelf ;; x64) basic_machine=x86_64-pc ;; xbox) basic_machine=i686-pc - os=-mingw32 + os=mingw32 ;; xps | xps100) basic_machine=xps100-honeywell @@ -1283,11 +1282,11 @@ case $basic_machine in ;; ymp) basic_machine=ymp-cray - os=-unicos + os=unicos ;; none) basic_machine=none-none - os=-none + os=none ;; # Here we handle the default manufacturer of certain CPU types. It is in @@ -1365,196 +1364,194 @@ 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. - -auroraux) - os=-auroraux + # solaris* is a basic system type, with this one exception. + auroraux) + os=auroraux ;; - -solaris1 | -solaris1.*) + solaris1 | solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; - -solaris) - os=-solaris2 + solaris) + os=solaris2 ;; - -unixware*) - os=-sysv4.2uw + unixware*) + os=sysv4.2uw ;; - -gnu/linux*) + gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; # es1800 is here to avoid being matched by es* (a different OS) - -es1800*) - os=-ose + es1800*) + os=ose ;; # Now accept the basic system types. # The portable systems comes first. # Each alternative MUST end in a * to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* | -cloudabi* | -sortix* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \ - | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ - | -midnightbsd*) + # sysv* is not here because it comes later, after sysvr4. + gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | sco* | esix* | isc* | aix* | cnk* | sunos | sunos[34]*\ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | kopensolaris* | plan9* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | rtu* | xenix* \ + | hiux* | knetbsd* | mirbsd* | netbsd* \ + | bitrig* | openbsd* | solidbsd* | libertybsd* \ + | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusos* | chorusrdb* | cegcc* | glidix* \ + | cygwin* | msys* | pe* | psos* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \ + | linux-newlib* | linux-musl* | linux-uclibc* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* \ + | morphos* | superux* | rtmk* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; - -qnx*) + qnx*) case $basic_machine in x86-* | i*86-*) ;; *) - os=-nto$os + os=nto-$os ;; esac ;; - -nto-qnx*) + nto-qnx*) ;; - -nto*) + nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - -sim | -xray | -os68k* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + sim | xray | os68k* | v88r* \ + | windows* | osx | abug | netware* | os9* \ + | macos* | mpw* | magic* | mmixware* | mon960* | lnews*) ;; - -mac*) + mac*) os=`echo "$os" | sed -e 's|mac|macos|'` ;; - -linux-dietlibc) - os=-linux-dietlibc + linux-dietlibc) + os=linux-dietlibc ;; - -linux*) + linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; - -sunos5*) + sunos5*) os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; - -sunos6*) + sunos6*) os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; - -opened*) - os=-openedition + opened*) + os=openedition ;; - -os400*) - os=-os400 + os400*) + os=os400 ;; - -wince*) - os=-wince + wince*) + os=wince ;; - -utek*) - os=-bsd + utek*) + os=bsd ;; - -dynix*) - os=-bsd + dynix*) + os=bsd ;; - -acis*) - os=-aos + acis*) + os=aos ;; - -atheos*) - os=-atheos + atheos*) + os=atheos ;; - -syllable*) - os=-syllable + syllable*) + os=syllable ;; - -386bsd) - os=-bsd + 386bsd) + os=bsd ;; - -ctix* | -uts*) - os=-sysv + ctix* | uts*) + os=sysv ;; - -nova*) - os=-rtmk-nova + nova*) + os=rtmk-nova ;; - -ns2) - os=-nextstep2 + ns2) + os=nextstep2 ;; - -nsk*) - os=-nsk + nsk*) + os=nsk ;; # Preserve the version number of sinix5. - -sinix5.*) + sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` ;; - -sinix*) - os=-sysv4 + sinix*) + os=sysv4 ;; - -tpf*) - os=-tpf + tpf*) + os=tpf ;; - -triton*) - os=-sysv3 + triton*) + os=sysv3 ;; - -oss*) - os=-sysv3 + oss*) + os=sysv3 ;; - -svr4*) - os=-sysv4 + svr4*) + os=sysv4 ;; - -svr3) - os=-sysv3 + svr3) + os=sysv3 ;; - -sysvr4) - os=-sysv4 + sysvr4) + os=sysv4 ;; - # This must come after -sysvr4. - -sysv*) + # This must come after sysvr4. + sysv*) ;; - -ose*) - os=-ose + ose*) + os=ose ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint + *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + os=mint ;; - -zvmoe) - os=-zvmoe + zvmoe) + os=zvmoe ;; - -dicos*) - os=-dicos + dicos*) + os=dicos ;; - -pikeos*) + pikeos*) # Until real need of OS specific support for # particular features comes up, bare metal # configurations are quite functional. case $basic_machine in arm*) - os=-eabi + os=eabi ;; *) - os=-elf + os=elf ;; esac ;; - -nacl*) + nacl*) ;; - -ios) + ios) ;; - -none) + none) ;; - -*-eabi) + *-eabi) ;; *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; @@ -1573,173 +1570,173 @@ else case $basic_machine in score-*) - os=-elf + os=elf ;; spu-*) - os=-elf + os=elf ;; *-acorn) - os=-riscix1.2 + os=riscix1.2 ;; arm*-rebel) - os=-linux + os=linux ;; arm*-semi) - os=-aout + os=aout ;; c4x-* | tic4x-*) - os=-coff + os=coff ;; c8051-*) - os=-elf + os=elf ;; hexagon-*) - os=-elf + os=elf ;; tic54x-*) - os=-coff + os=coff ;; tic55x-*) - os=-coff + os=coff ;; tic6x-*) - os=-coff + os=coff ;; # This must come before the *-dec entry. pdp10-*) - os=-tops20 + os=tops20 ;; pdp11-*) - os=-none + os=none ;; *-dec | vax-*) - os=-ultrix4.2 + os=ultrix4.2 ;; m68*-apollo) - os=-domain + os=domain ;; i386-sun) - os=-sunos4.0.2 + os=sunos4.0.2 ;; m68000-sun) - os=-sunos3 + os=sunos3 ;; m68*-cisco) - os=-aout + os=aout ;; mep-*) - os=-elf + os=elf ;; mips*-cisco) - os=-elf + os=elf ;; mips*-*) - os=-elf + os=elf ;; or32-*) - os=-coff + os=coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 + os=sysv3 ;; sparc-* | *-sun) - os=-sunos4.1.1 + os=sunos4.1.1 ;; pru-*) - os=-elf + os=elf ;; *-be) - os=-beos + os=beos ;; *-ibm) - os=-aix + os=aix ;; *-knuth) - os=-mmixware + os=mmixware ;; *-wec) - os=-proelf + os=proelf ;; *-winbond) - os=-proelf + os=proelf ;; *-oki) - os=-proelf + os=proelf ;; *-hp) - os=-hpux + os=hpux ;; *-hitachi) - os=-hiux + os=hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv + os=sysv ;; *-cbm) - os=-amigaos + os=amigaos ;; *-dg) - os=-dgux + os=dgux ;; *-dolphin) - os=-sysv3 + os=sysv3 ;; m68k-ccur) - os=-rtu + os=rtu ;; m88k-omron*) - os=-luna + os=luna ;; *-next) - os=-nextstep + os=nextstep ;; *-sequent) - os=-ptx + os=ptx ;; *-crds) - os=-unos + os=unos ;; *-ns) - os=-genix + os=genix ;; i370-*) - os=-mvs + os=mvs ;; *-gould) - os=-sysv + os=sysv ;; *-highlevel) - os=-bsd + os=bsd ;; *-encore) - os=-bsd + os=bsd ;; *-sgi) - os=-irix + os=irix ;; *-siemens) - os=-sysv4 + os=sysv4 ;; *-masscomp) - os=-rtu + os=rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=-uxpv + os=uxpv ;; *-rom68k) - os=-coff + os=coff ;; *-*bug) - os=-coff + os=coff ;; *-apple) - os=-macos + os=macos ;; *-atari*) - os=-mint + os=mint ;; *) - os=-none + os=none ;; esac fi @@ -1750,67 +1747,67 @@ vendor=unknown case $basic_machine in *-unknown) case $os in - -riscix*) + riscix*) vendor=acorn ;; - -sunos*) + sunos*) vendor=sun ;; - -cnk*|-aix*) + cnk*|-aix*) vendor=ibm ;; - -beos*) + beos*) vendor=be ;; - -hpux*) + hpux*) vendor=hp ;; - -mpeix*) + mpeix*) vendor=hp ;; - -hiux*) + hiux*) vendor=hitachi ;; - -unos*) + unos*) vendor=crds ;; - -dgux*) + dgux*) vendor=dg ;; - -luna*) + luna*) vendor=omron ;; - -genix*) + genix*) vendor=ns ;; - -mvs* | -opened*) + mvs* | opened*) vendor=ibm ;; - -os400*) + os400*) vendor=ibm ;; - -ptx*) + ptx*) vendor=sequent ;; - -tpf*) + tpf*) vendor=ibm ;; - -vxsim* | -vxworks* | -windiss*) + vxsim* | vxworks* | windiss*) vendor=wrs ;; - -aux*) + aux*) vendor=apple ;; - -hms*) + hms*) vendor=hitachi ;; - -mpw* | -macos*) + mpw* | macos*) vendor=apple ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) vendor=atari ;; - -vos*) + vos*) vendor=stratus ;; esac @@ -1818,7 +1815,7 @@ case $basic_machine in ;; esac -echo "$basic_machine$os" +echo "$basic_machine-$os" exit # Local variables: |