* config.sub (os): Move -es1800* case above -es*.

* testsuite/config-sub.data: Add several test cases.
This commit is contained in:
Ben Elliston 2018-01-14 11:18:55 +11:00
parent 8ca6442e66
commit 391ea45d14
3 changed files with 14 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2018-01-14 Ben Elliston <bje@gnu.org>
* config.sub (os): Move -es1800* case above -es*.
* testsuite/config-sub.data: Add several test cases.
2018-01-14 Ben Elliston <bje@gnu.org> 2018-01-14 Ben Elliston <bje@gnu.org>
* config.sub (os): Remove overlapping pattern -svr4*. * config.sub (os): Remove overlapping pattern -svr4*.

9
config.sub vendored
View File

@ -1355,6 +1355,10 @@ case $os in
-gnu/linux*) -gnu/linux*)
os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` 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
;;
# Now accept the basic system types. # Now accept the basic system types.
# The portable systems comes first. # The portable systems comes first.
# Each alternative MUST end in a * to match a version number. # Each alternative MUST end in a * to match a version number.
@ -1402,7 +1406,7 @@ case $os in
-nto*) -nto*)
os=`echo $os | sed -e 's|nto|nto-qnx|'` os=`echo $os | sed -e 's|nto|nto-qnx|'`
;; ;;
-sim | -es1800* | -xray | -os68k* | -v88r* \ -sim | -xray | -os68k* | -v88r* \
| -windows* | -osx | -abug | -netware* | -os9* \ | -windows* | -osx | -abug | -netware* | -os9* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;; ;;
@ -1491,9 +1495,6 @@ case $os in
-ose*) -ose*)
os=-ose os=-ose
;; ;;
-es1800*)
os=-ose
;;
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
os=-mint os=-mint
;; ;;

View File

@ -133,6 +133,7 @@ e500v2-wrs-linux powerpc-wrs-linux-gnuspe
e500v2-wrs-vxworks powerpc-wrs-vxworksspe e500v2-wrs-vxworks powerpc-wrs-vxworksspe
epiphany-elf epiphany-unknown-elf epiphany-elf epiphany-unknown-elf
epiphany epiphany-unknown-none epiphany epiphany-unknown-none
es1800 m68k-ericsson-ose
fido-elf fido-unknown-elf fido-elf fido-unknown-elf
fido fido-unknown-none fido fido-unknown-none
fr30 fr30-unknown-none fr30 fr30-unknown-none
@ -226,6 +227,7 @@ m32rle m32rle-unknown-none
m32r m32r-unknown-none m32r m32r-unknown-none
m68000 m68000-unknown-none m68000 m68000-unknown-none
m68k m68k-unknown-none m68k m68k-unknown-none
m68k-es1800 m68k-unknown-ose
m68knommu m68k-unknown-linux-gnu m68knommu m68k-unknown-linux-gnu
m88k m88k-unknown-none m88k m88k-unknown-none
m88k-omron m88k-omron-luna m88k-omron m88k-omron-luna
@ -355,6 +357,8 @@ or1k or1k-unknown-none
or32-linux or32-unknown-linux-gnu or32-linux or32-unknown-linux-gnu
or32 or32-unknown-coff or32 or32-unknown-coff
os400 powerpc-ibm-os400 os400 powerpc-ibm-os400
ose68k m68k-ericsson-ose
ose m68k-ericsson-ose
parisc hppa-unknown-linux-gnu parisc hppa-unknown-linux-gnu
pc98-freebsd i386-pc-freebsd pc98-freebsd i386-pc-freebsd
pdp10 pdp10-unknown-tops20 pdp10 pdp10-unknown-tops20