Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 341dc91

Browse files
committed
Added latest config.guess and config.sub
1 parent 1b113a2 commit 341dc91

File tree

2 files changed

+35
-18
lines changed

2 files changed

+35
-18
lines changed

src/config.guess

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ EOF
266266
exit 0 ;;
267267
# The situation for MiNT is a little confusing. The machine name
268268
# can be virtually everything (everything which is not
269-
# "atarist" or "atariste" at least should have a processor
269+
# "atarist" or "atariste" at least should have a processor
270270
# > m68000). The system name ranges from "MiNT" over "FreeMiNT"
271271
# to the lowercase version "mint" (or "freemint"). Finally
272272
# the system name "TOS" denotes a system which is actually not
@@ -588,7 +588,7 @@ EOF
588588
echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
589589
exit 0 ;;
590590
CRAY*SV1:*:*:*)
591-
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
591+
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
592592
exit 0 ;;
593593
CRAY-2:*:*:*)
594594
echo cray2-cray-unicos
@@ -604,7 +604,7 @@ EOF
604604
hp300:OpenBSD:*:*)
605605
echo m68k-unknown-openbsd${UNAME_RELEASE}
606606
exit 0 ;;
607-
i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
607+
i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
608608
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
609609
exit 0 ;;
610610
sparc*:BSD/OS:*:*)
@@ -721,7 +721,7 @@ EOF
721721
if test "$?" = 0 ; then
722722
LIBC="libc1"
723723
fi
724-
fi
724+
fi
725725
rm -f $dummy.c $dummy
726726
echo powerpc-unknown-linux-gnu${LIBC}
727727
exit 0
@@ -1024,8 +1024,17 @@ EOF
10241024
*:Mac*OS:*:*)
10251025
echo ${UNAME_MACHINE}-apple-macos${UNAME_RELEASE}
10261026
exit 0 ;;
1027+
*:procnto*:*:* | *:QNX:[0123456789]*:*)
1028+
if test "${UNAME_MACHINE}" = "x86pc"; then
1029+
UNAME_MACHINE=pc
1030+
fi
1031+
echo `uname -p`-${UNAME_MACHINE}-nto-qnx
1032+
exit 0;;
10271033
*:QNX:*:4*)
1028-
echo i386-qnx-qnx${UNAME_VERSION}
1034+
echo i386-pc-qnx
1035+
exit 0 ;;
1036+
NSR-W:NONSTOP_KERNEL:*:*)
1037+
echo nsr-tandem-nsk${UNAME_RELEASE}
10291038
exit 0 ;;
10301039
esac
10311040

src/config.sub

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ esac
7373
# Here we must recognize all the valid KERNEL-OS combinations.
7474
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
7575
case $maybe_os in
76-
linux-gnu*)
76+
nto-qnx* | linux-gnu*)
7777
os=-$maybe_os
7878
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
7979
;;
@@ -174,6 +174,7 @@ case $basic_machine in
174174
tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
175175
| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
176176
| 580 | i960 | h8300 \
177+
| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
177178
| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
178179
| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
179180
| alphaev6[78] \
@@ -207,6 +208,7 @@ case $basic_machine in
207208
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
208209
| power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
209210
| xmp-* | ymp-* \
211+
| x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
210212
| hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
211213
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
212214
| alphaev6[78]-* \
@@ -471,9 +473,6 @@ case $basic_machine in
471473
basic_machine=i386-unknown
472474
os=-mingw32
473475
;;
474-
i386-qnx | qnx)
475-
basic_machine=i386-qnx
476-
;;
477476
iris | iris4d)
478477
basic_machine=mips-sgi
479478
case $os in
@@ -596,6 +595,9 @@ case $basic_machine in
596595
np1)
597596
basic_machine=np1-gould
598597
;;
598+
nsr-tandem)
599+
basic_machine=nsr-tandem
600+
;;
599601
op50n-* | op60c-*)
600602
basic_machine=hppa1.1-oki
601603
os=-proelf
@@ -936,6 +938,18 @@ case $os in
936938
| -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*)
937939
# Remember, each alternative MUST END IN *, to match a version number.
938940
;;
941+
-qnx*)
942+
case $basic_machine in
943+
x86-* | i[34567]86-*)
944+
;;
945+
*)
946+
os=-nto$os
947+
;;
948+
esac
949+
;;
950+
-nto*)
951+
os=-nto-qnx
952+
;;
939953
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
940954
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
941955
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
@@ -982,6 +996,9 @@ case $os in
982996
-ns2 )
983997
os=-nextstep2
984998
;;
999+
-nsk)
1000+
os=-nsk
1001+
;;
9851002
# Preserve the version number of sinix5.
9861003
-sinix5.*)
9871004
os=`echo $os | sed -e 's|sinix|sysv|'`
@@ -995,9 +1012,6 @@ case $os in
9951012
-oss*)
9961013
os=-sysv3
9971014
;;
998-
-qnx)
999-
os=-qnx4
1000-
;;
10011015
-svr4)
10021016
os=-sysv4
10031017
;;
@@ -1022,9 +1036,6 @@ case $os in
10221036
-*mint | -*MiNT)
10231037
os=-mint
10241038
;;
1025-
-neutrino* | -nto*)
1026-
os=-neutrino
1027-
;;
10281039
-none)
10291040
;;
10301041
*)
@@ -1245,9 +1256,6 @@ case $basic_machine in
12451256
-*mint | -*MiNT)
12461257
vendor=atari
12471258
;;
1248-
-neutrino* | -nto*)
1249-
vendor=qnx
1250-
;;
12511259
esac
12521260
basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
12531261
;;

0 commit comments

Comments
 (0)