* config.sub (maybe_os): Remove duplicated pattern -haiku*.

(basic_machine): Don't match haiku in the manufacturer field.
	* testsuite/config-sub.data: Add a test.
This commit is contained in:
Ben Elliston 2018-01-14 10:51:48 +11:00
parent aaaf06062a
commit d1a4abff22
3 changed files with 8 additions and 4 deletions

View File

@ -1,3 +1,9 @@
2018-01-14 Ben Elliston <bje@gnu.org>
* config.sub (maybe_os): Remove duplicated pattern -haiku*.
(basic_machine): Don't match haiku in the manufacturer field.
* testsuite/config-sub.data: Add a test.
2018-01-14 Ben Elliston <bje@gnu.org>
* config.sub (maybe_os): Remove duplicated pattern -opened* which

5
config.sub vendored
View File

@ -1406,7 +1406,7 @@ case $os in
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -v88r* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
@ -1624,9 +1624,6 @@ case $basic_machine in
*-be)
os=-beos
;;
*-haiku)
os=-haiku
;;
*-ibm)
os=-aix
;;

View File

@ -198,6 +198,7 @@ i686-android-linux i686-unknown-linux-android
i686-dicos i686-pc-dicos
i686-elf i686-pc-elf
i686-ericsson-dicos i686-ericsson-dicos
i686-haiku i686-pc-haiku
i686-kopensolaris5.11-gnu i686-pc-kopensolaris5.11-gnu
i786-elf i786-pc-elf
i860 i860-unknown-sysv