|
1 --- config.sub.orig 2014-03-09 18:34:03 -0700 |
|
2 +++ config.sub 2014-03-14 19:49:48 -0700 |
|
3 @@ -115,7 +115,7 @@ |
|
4 # Here we must recognize all the valid KERNEL-OS combinations. |
|
5 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
|
6 case $maybe_os in |
|
7 - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
|
8 + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | \ |
|
9 linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
|
10 knetbsd*-gnu* | netbsd*-gnu* | \ |
|
11 kopensolaris*-gnu* | \ |
|
12 @@ -123,10 +123,6 @@ |
|
13 os=-$maybe_os |
|
14 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
|
15 ;; |
|
16 - android-linux) |
|
17 - os=-linux-android |
|
18 - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown |
|
19 - ;; |
|
20 *) |
|
21 basic_machine=`echo $1 | sed 's/-[^-]*$//'` |
|
22 if [ $basic_machine != $1 ] |
|
23 @@ -1367,7 +1363,7 @@ |
|
24 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
|
25 | -chorusos* | -chorusrdb* | -cegcc* \ |
|
26 | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
|
27 - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ |
|
28 + | -mingw32* | -mingw64* | -linux-gnu* \ |
|
29 | -linux-newlib* | -linux-musl* | -linux-uclibc* \ |
|
30 | -uxpv* | -beos* | -mpeix* | -udk* \ |
|
31 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
|
32 @@ -1508,6 +1504,9 @@ |
|
33 ;; |
|
34 -nacl*) |
|
35 ;; |
|
36 + -android*) |
|
37 + os=-android |
|
38 + ;; |
|
39 -none) |
|
40 ;; |
|
41 *) |
|
42 @@ -1777,6 +1776,9 @@ |
|
43 -vos*) |
|
44 vendor=stratus |
|
45 ;; |
|
46 + *-android*|*-linuxandroid*) |
|
47 + vendor=linux- |
|
48 + ;; |
|
49 esac |
|
50 basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` |
|
51 ;; |