[cfe-commits] r169562 - in /cfe/trunk: lib/Driver/ToolChains.cpp test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/as test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/ld test/Driver/Inputs/basic_android_tree/i686-linux-android/ test/Driver/Inputs/basic_android_tree/lib/gcc/i686-linux-android/ test/Driver/Inputs/basic_android_tree/mipsel-linux-android/bin/as test/Driver/Inputs/basic_android_tree/mipsel-linux-android/bin/ld test/Driver/android.c test/Driver/linux-ld.c
Logan Chien
tzuhsiang.chien at gmail.com
Thu Dec 6 15:40:31 PST 2012
Author: logan
Date: Thu Dec 6 17:40:31 2012
New Revision: 169562
URL: http://llvm.org/viewvc/llvm-project?rev=169562&view=rev
Log:
Revert r169557. It seems that the test is too restricted
and will break the build on buildbot.
Removed:
cfe/trunk/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/as
cfe/trunk/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/ld
cfe/trunk/test/Driver/Inputs/basic_android_tree/i686-linux-android/
cfe/trunk/test/Driver/Inputs/basic_android_tree/lib/gcc/i686-linux-android/
cfe/trunk/test/Driver/Inputs/basic_android_tree/mipsel-linux-android/bin/as
cfe/trunk/test/Driver/Inputs/basic_android_tree/mipsel-linux-android/bin/ld
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=169562&r1=169561&r2=169562&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains.cpp Thu Dec 6 17:40:31 2012
@@ -1094,7 +1094,6 @@
"i686-pc-linux-gnu",
"i486-linux-gnu",
"i386-linux-gnu",
- "i686-linux-android",
"i686-redhat-linux",
"i586-redhat-linux",
"i386-redhat-linux",
Removed: 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=169561&view=auto
==============================================================================
(empty)
Removed: 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=169561&view=auto
==============================================================================
(empty)
Removed: 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=169561&view=auto
==============================================================================
(empty)
Removed: 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=169561&view=auto
==============================================================================
(empty)
Removed: cfe/trunk/test/Driver/android.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/android.c?rev=169561&view=auto
==============================================================================
--- cfe/trunk/test/Driver/android.c (original)
+++ cfe/trunk/test/Driver/android.c (removed)
@@ -1,21 +0,0 @@
-// 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=169562&r1=169561&r2=169562&view=diff
==============================================================================
--- cfe/trunk/test/Driver/linux-ld.c (original)
+++ cfe/trunk/test/Driver/linux-ld.c Thu Dec 6 17:40:31 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 i686-linux-android \
+// RUN: -target i386-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 i686-linux-android \
+// RUN: -target i386-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 i686-linux-android \
+// RUN: -target i386-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 i686-linux-android \
+// RUN: -target i386-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