[cfe-commits] r169557 - in /cfe/trunk: lib/Driver/ test/Driver/ test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/ test/Driver/Inputs/basic_android_tree/i686-linux-android/ test/Driver/Inputs/basic_android_tree/i686-linux-android/bin/ test/Driver/Inputs/basic_android_tree/lib/gcc/i686-linux-android/ test/Driver/Inputs/basic_android_tree/lib/gcc/i686-linux-android/4.6/ test/Driver/Inputs/basic_android_tree/mipsel-linux-android/bin/
Logan Chien
tzuhsiang.chien at gmail.com
Thu Dec 6 14:59:37 PST 2012
Author: logan
Date: Thu Dec 6 16:59:37 2012
New Revision: 169557
URL: http://llvm.org/viewvc/llvm-project?rev=169557&view=rev
Log:
Add i686-linux-android for gcc toolchain detection.
* Look for i686-linux-android under <sysroot>/lib/gcc.
* This patch also slightly enhance the test suite for
Android GCC toolchain detection.
Added:
cfe/trunk/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/as (with props)
cfe/trunk/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/ld (with props)
cfe/trunk/test/Driver/Inputs/basic_android_tree/i686-linux-android/
cfe/trunk/test/Driver/Inputs/basic_android_tree/i686-linux-android/bin/
cfe/trunk/test/Driver/Inputs/basic_android_tree/i686-linux-android/bin/ar (with props)
cfe/trunk/test/Driver/Inputs/basic_android_tree/i686-linux-android/bin/ld (with props)
cfe/trunk/test/Driver/Inputs/basic_android_tree/lib/gcc/i686-linux-android/
cfe/trunk/test/Driver/Inputs/basic_android_tree/lib/gcc/i686-linux-android/4.6/
cfe/trunk/test/Driver/Inputs/basic_android_tree/mipsel-linux-android/bin/as (with props)
cfe/trunk/test/Driver/Inputs/basic_android_tree/mipsel-linux-android/bin/ld (with props)
cfe/trunk/test/Driver/android.c
Modified:
cfe/trunk/lib/Driver/ToolChains.cpp
cfe/trunk/test/Driver/linux-ld.c
Modified: cfe/trunk/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=169557&r1=169556&r2=169557&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains.cpp Thu Dec 6 16:59:37 2012
@@ -1094,6 +1094,7 @@
"i686-pc-linux-gnu",
"i486-linux-gnu",
"i386-linux-gnu",
+ "i686-linux-android",
"i686-redhat-linux",
"i586-redhat-linux",
"i386-redhat-linux",
Added: cfe/trunk/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/as
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/as?rev=169557&view=auto
==============================================================================
(empty)
Propchange: cfe/trunk/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/as
------------------------------------------------------------------------------
svn:executable = *
Added: cfe/trunk/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/ld
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/ld?rev=169557&view=auto
==============================================================================
(empty)
Propchange: cfe/trunk/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/ld
------------------------------------------------------------------------------
svn:executable = *
Added: cfe/trunk/test/Driver/Inputs/basic_android_tree/i686-linux-android/bin/ar
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_android_tree/i686-linux-android/bin/ar?rev=169557&view=auto
==============================================================================
(empty)
Propchange: cfe/trunk/test/Driver/Inputs/basic_android_tree/i686-linux-android/bin/ar
------------------------------------------------------------------------------
svn:executable = *
Added: cfe/trunk/test/Driver/Inputs/basic_android_tree/i686-linux-android/bin/ld
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_android_tree/i686-linux-android/bin/ld?rev=169557&view=auto
==============================================================================
(empty)
Propchange: cfe/trunk/test/Driver/Inputs/basic_android_tree/i686-linux-android/bin/ld
------------------------------------------------------------------------------
svn:executable = *
Added: cfe/trunk/test/Driver/Inputs/basic_android_tree/mipsel-linux-android/bin/as
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_android_tree/mipsel-linux-android/bin/as?rev=169557&view=auto
==============================================================================
(empty)
Propchange: cfe/trunk/test/Driver/Inputs/basic_android_tree/mipsel-linux-android/bin/as
------------------------------------------------------------------------------
svn:executable = *
Added: cfe/trunk/test/Driver/Inputs/basic_android_tree/mipsel-linux-android/bin/ld
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_android_tree/mipsel-linux-android/bin/ld?rev=169557&view=auto
==============================================================================
(empty)
Propchange: cfe/trunk/test/Driver/Inputs/basic_android_tree/mipsel-linux-android/bin/ld
------------------------------------------------------------------------------
svn:executable = *
Added: cfe/trunk/test/Driver/android.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/android.c?rev=169557&view=auto
==============================================================================
--- cfe/trunk/test/Driver/android.c (added)
+++ cfe/trunk/test/Driver/android.c Thu Dec 6 16:59:37 2012
@@ -0,0 +1,21 @@
+// Test Android Toolchain Detection
+
+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o \
+// RUN: -target arm-linux-androideabi \
+// RUN: -gcc-toolchain %S/Inputs/basic_android_tree 2>&1 \
+// RUN: | FileCheck --check-prefix=CHECK-ANDROID-ARM %s
+// CHECK-ANDROID-ARM: "{{.*}}/Inputs/basic_android_tree/{{.*}}/arm-linux-androideabi/bin/as"
+// CHECK-ANDROID-ARM: "{{.*}}/Inputs/basic_android_tree/{{.*}}/arm-linux-androideabi/bin/ld"
+
+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o \
+// RUN: -target mipsel-linux-android \
+// RUN: -gcc-toolchain %S/Inputs/basic_android_tree 2>&1 \
+// RUN: | FileCheck --check-prefix=CHECK-ANDROID-MIPS %s
+// CHECK-ANDROID-MIPS: "{{.*}}/Inputs/basic_android_tree/{{.*}}/mipsel-linux-android/bin/as"
+// CHECK-ANDROID-MIPS: "{{.*}}/Inputs/basic_android_tree/{{.*}}/mipsel-linux-android/bin/ld"
+
+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o \
+// RUN: -target i686-linux-android \
+// RUN: -gcc-toolchain %S/Inputs/basic_android_tree 2>&1 \
+// RUN: | FileCheck --check-prefix=CHECK-ANDROID-X86 %s
+// CHECK-ANDROID-X86: "{{.*}}/Inputs/basic_android_tree/{{.*}}/i686-linux-android/bin/ld"
Modified: cfe/trunk/test/Driver/linux-ld.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/linux-ld.c?rev=169557&r1=169556&r2=169557&view=diff
==============================================================================
--- cfe/trunk/test/Driver/linux-ld.c (original)
+++ cfe/trunk/test/Driver/linux-ld.c Thu Dec 6 16:59:37 2012
@@ -412,7 +412,7 @@
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
// RUN: | FileCheck --check-prefix=CHECK-ANDROID %s
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
-// RUN: -target i386-linux-android \
+// RUN: -target i686-linux-android \
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
// RUN: | FileCheck --check-prefix=CHECK-ANDROID %s
// CHECK-ANDROID: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
@@ -439,7 +439,7 @@
// RUN: -shared \
// RUN: | FileCheck --check-prefix=CHECK-ANDROID-SO %s
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
-// RUN: -target i386-linux-android \
+// RUN: -target i686-linux-android \
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
// RUN: -shared \
// RUN: | FileCheck --check-prefix=CHECK-ANDROID-SO %s
@@ -468,7 +468,7 @@
// RUN: -static \
// RUN: | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
-// RUN: -target i386-linux-android \
+// RUN: -target i686-linux-android \
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
// RUN: -static \
// RUN: | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s
@@ -496,7 +496,7 @@
// RUN: -pie \
// RUN: | FileCheck --check-prefix=CHECK-ANDROID-PIE %s
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
-// RUN: -target i386-linux-android \
+// RUN: -target i686-linux-android \
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
// RUN: -pie \
// RUN: | FileCheck --check-prefix=CHECK-ANDROID-PIE %s
More information about the cfe-commits
mailing list