Just fyi: this broke Chrome's build of compiler-rt using tot Clang against the sysroot generated by NDK r16's (I think) make_standalong_toolchain.py, see https://crbug.com/902270
It looks like we'll just hack around it though. On Mon, Nov 5, 2018 at 9:57 PM, Dan Albert via cfe-commits <cfe-commits@lists.llvm.org> wrote: > Author: danalbert > Date: Mon Nov 5 12:57:46 2018 > New Revision: 346167 > > URL: http://llvm.org/viewvc/llvm-project?rev=346167&view=rev > Log: > [Driver] Reland again again: Default Android toolchains to libc++. > > Landed more fixes to the compiler-rt Android tests. > > Original review was https://reviews.llvm.org/D53109. > > Added: > > cfe/trunk/test/Driver/Inputs/basic_android_ndk_tree/sysroot/usr/include/c++/v1/.keep > Modified: > cfe/trunk/lib/Driver/ToolChains/Linux.cpp > cfe/trunk/lib/Driver/ToolChains/Linux.h > cfe/trunk/test/Driver/android-ndk-standalone.cpp > > Modified: cfe/trunk/lib/Driver/ToolChains/Linux.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Linux.cpp?rev=346167&r1=346166&r2=346167&view=diff > ============================================================================== > --- cfe/trunk/lib/Driver/ToolChains/Linux.cpp (original) > +++ cfe/trunk/lib/Driver/ToolChains/Linux.cpp Mon Nov 5 12:57:46 2018 > @@ -443,6 +443,12 @@ Linux::Linux(const Driver &D, const llvm > addPathIfExists(D, SysRoot + "/usr/lib", Paths); > } > > +ToolChain::CXXStdlibType Linux::GetDefaultCXXStdlibType() const { > + if (getTriple().isAndroid()) > + return ToolChain::CST_Libcxx; > + return ToolChain::CST_Libstdcxx; > +} > + > bool Linux::HasNativeLLVMSupport() const { return true; } > > Tool *Linux::buildLinker() const { return new > tools::gnutools::Linker(*this); } > > Modified: cfe/trunk/lib/Driver/ToolChains/Linux.h > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Linux.h?rev=346167&r1=346166&r2=346167&view=diff > ============================================================================== > --- cfe/trunk/lib/Driver/ToolChains/Linux.h (original) > +++ cfe/trunk/lib/Driver/ToolChains/Linux.h Mon Nov 5 12:57:46 2018 > @@ -37,6 +37,7 @@ public: > llvm::opt::ArgStringList &CC1Args) const override; > void AddIAMCUIncludeArgs(const llvm::opt::ArgList &DriverArgs, > llvm::opt::ArgStringList &CC1Args) const override; > + CXXStdlibType GetDefaultCXXStdlibType() const override; > bool isPIEDefault() const override; > bool IsMathErrnoDefault() const override; > SanitizerMask getSupportedSanitizers() const override; > > Added: > cfe/trunk/test/Driver/Inputs/basic_android_ndk_tree/sysroot/usr/include/c++/v1/.keep > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_android_ndk_tree/sysroot/usr/include/c%2B%2B/v1/.keep?rev=346167&view=auto > ============================================================================== > (empty) > > Modified: cfe/trunk/test/Driver/android-ndk-standalone.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/android-ndk-standalone.cpp?rev=346167&r1=346166&r2=346167&view=diff > ============================================================================== > --- cfe/trunk/test/Driver/android-ndk-standalone.cpp (original) > +++ cfe/trunk/test/Driver/android-ndk-standalone.cpp Mon Nov 5 12:57:46 2018 > @@ -2,21 +2,13 @@ > // toolchain. > // > // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ > -// RUN: -target arm-linux-androideabi21 -stdlib=libstdc++ \ > +// RUN: -target arm-linux-androideabi21 \ > // RUN: -B%S/Inputs/basic_android_ndk_tree \ > // RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \ > // RUN: | FileCheck %s > // CHECK: {{.*}}clang{{.*}}" "-cc1" > // CHECK: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]" > -// CHECK: "-internal-isystem" "{{.*}}/include/c++/4.9" > -// CHECK-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/armv7-a/thumb" > -// CHECK-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/armv7-a" > -// CHECK-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/thumb" > -// CHECK: "-internal-isystem" "{{.*}}/include/c++/4.9/arm-linux-androideabi" > -// CHECK-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/armv7-a/thumb" > -// CHECK-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/armv7-a" > -// CHECK-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/thumb" > -// CHECK: "-internal-isystem" "{{.*}}/include/c++/4.9/backward" > +// CHECK: "-internal-isystem" "{{.*}}/include/c++/v1" > // CHECK: "-internal-isystem" "{{.*}}/sysroot/usr/local/include" > // CHECK: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include" > // CHECK: "-internal-externc-isystem" > "{{.*}}/sysroot/usr/include/arm-linux-androideabi" > @@ -49,21 +41,47 @@ > // CHECK-14: "-L{{.*}}/sysroot/usr/lib/arm-linux-androideabi" > // > // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ > -// RUN: -target armv7a-none-linux-androideabi21 -stdlib=libstdc++ \ > +// RUN: -target arm-linux-androideabi21 -stdlib=libstdc++ \ > +// RUN: -B%S/Inputs/basic_android_ndk_tree \ > +// RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \ > +// RUN: | FileCheck --check-prefix=CHECK-STDCXX %s > +// CHECK-STDCXX: {{.*}}clang{{.*}}" "-cc1" > +// CHECK-STDCXX: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]" > +// CHECK-STDCXX: "-internal-isystem" "{{.*}}/include/c++/4.9" > +// CHECK-STDCXX-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/armv7-a/thumb" > +// CHECK-STDCXX-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/armv7-a" > +// CHECK-STDCXX-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/thumb" > +// CHECK-STDCXX: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi" > +// CHECK-STDCXX-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/armv7-a/thumb" > +// CHECK-STDCXX-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/armv7-a" > +// CHECK-STDCXX-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/thumb" > +// CHECK-STDCXX: "-internal-isystem" "{{.*}}/include/c++/4.9/backward" > +// CHECK-STDCXX: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" > +// CHECK-STDCXX-NOT: > "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb" > +// CHECK-STDCXX-NOT: "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9/armv7-a" > +// CHECK-STDCXX-NOT: "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9/thumb" > +// CHECK-STDCXX: "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9" > +// CHECK-STDCXX-NOT: > "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb" > +// CHECK-STDCXX-NOT: "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9/armv7-a" > +// CHECK-STDCXX-NOT: "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9/thumb" > +// CHECK-STDCXX-NOT: "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9/../{{[^ > ]*}}/lib/armv7-a/thumb" > +// CHECK-STDCXX-NOT: "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9/../{{[^ > ]*}}/lib/armv7-a" > +// CHECK-STDCXX-NOT: "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9/../{{[^ > ]*}}/lib/thumb" > +// CHECK-STDCXX: "-L{{.*}}/sysroot/usr/lib/arm-linux-androideabi/21" > +// CHECK-STDCXX: "-L{{.*}}/sysroot/usr/lib/arm-linux-androideabi" > +// CHECK-STDCXX: "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9/../{{[^ > ]*}}/arm-linux-androideabi/lib" > +// CHECK-STDCXX-NOT: "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9/../{{[^ > ]*}}/lib/armv7-a/thumb" > +// CHECK-STDCXX-NOT: "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9/../{{[^ > ]*}}/lib/armv7-a" > +// CHECK-STDCXX-NOT: "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9/../{{[^ > ]*}}/lib/thumb" > +// > +// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ > +// RUN: -target armv7a-none-linux-androideabi21 \ > // RUN: -B%S/Inputs/basic_android_ndk_tree \ > // RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \ > // RUN: | FileCheck --check-prefix=CHECK-ARMV7 %s > // CHECK-ARMV7: {{.*}}clang{{.*}}" "-cc1" > // CHECK-ARMV7: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]" > -// CHECK-ARMV7: "-internal-isystem" "{{.*}}/include/c++/4.9" > -// CHECK-ARMV7-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/armv7-a/thumb" > -// CHECK-ARMV7-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/thumb" > -// CHECK-ARMV7-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi" > -// CHECK-ARMV7: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/armv7-a" > -// CHECK-ARMV7-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/armv7-a/thumb" > -// CHECK-ARMV7-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/thumb" > -// CHECK-ARMV7-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi" > -// CHECK-ARMV7: "-internal-isystem" "{{.*}}/include/c++/4.9/backward" > +// CHECK-ARMV7: "-internal-isystem" "{{.*}}/include/c++/v1" > // CHECK-ARMV7: "-internal-isystem" "{{.*}}/sysroot/usr/local/include" > // CHECK-ARMV7: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include" > // CHECK-ARMV7: "-internal-externc-isystem" > "{{.*}}/sysroot/usr/include/arm-linux-androideabi" > @@ -89,19 +107,19 @@ > // > // Other flags that can trigger armv7 mode. > // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ > -// RUN: -target arm-linux-androideabi21 -stdlib=libstdc++ \ > +// RUN: -target arm-linux-androideabi21 \ > // RUN: -march=armv7 \ > // RUN: -B%S/Inputs/basic_android_ndk_tree \ > // RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \ > // RUN: | FileCheck --check-prefix=CHECK-ARMV7 %s > // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ > -// RUN: -target arm-linux-androideabi21 -stdlib=libstdc++ \ > +// RUN: -target arm-linux-androideabi21 \ > // RUN: -march=armv7a \ > // RUN: -B%S/Inputs/basic_android_ndk_tree \ > // RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \ > // RUN: | FileCheck --check-prefix=CHECK-ARMV7 %s > // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ > -// RUN: -target arm-linux-androideabi21 -stdlib=libstdc++ \ > +// RUN: -target arm-linux-androideabi21 \ > // RUN: -march=armv7-a \ > // RUN: -B%S/Inputs/basic_android_ndk_tree \ > // RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \ > @@ -109,22 +127,14 @@ > // > // ARM thumb mode. > // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ > -// RUN: -target arm-linux-androideabi21 -stdlib=libstdc++ \ > +// RUN: -target arm-linux-androideabi21 \ > // RUN: -mthumb \ > // RUN: -B%S/Inputs/basic_android_ndk_tree \ > // RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \ > // RUN: | FileCheck --check-prefix=CHECK-THUMB %s > // CHECK-THUMB: {{.*}}clang{{.*}}" "-cc1" > // CHECK-THUMB: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]" > -// CHECK-THUMB: "-internal-isystem" "{{.*}}/include/c++/4.9" > -// CHECK-THUMB-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/armv7/thumb" > -// CHECK-THUMB-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/armv7" > -// CHECK-THUMB-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi" > -// CHECK-THUMB: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/thumb" > -// CHECK-THUMB-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/armv7/thumb" > -// CHECK-THUMB-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/armv7" > -// CHECK-THUMB-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi" > -// CHECK-THUMB: "-internal-isystem" "{{.*}}/include/c++/4.9/backward" > +// CHECK-THUMB: "-internal-isystem" "{{.*}}/include/c++/v1" > // CHECK-THUMB: "-internal-isystem" "{{.*}}/sysroot/usr/local/include" > // CHECK-THUMB: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include" > // CHECK-THUMB: "-internal-externc-isystem" > "{{.*}}/sysroot/usr/include/arm-linux-androideabi" > @@ -151,22 +161,14 @@ > // > // ARM V7 thumb mode. > // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ > -// RUN: -target arm-linux-androideabi21 -stdlib=libstdc++ \ > +// RUN: -target arm-linux-androideabi21 \ > // RUN: -march=armv7-a -mthumb \ > // RUN: -B%S/Inputs/basic_android_ndk_tree \ > // RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \ > // RUN: | FileCheck --check-prefix=CHECK-ARMV7THUMB %s > // CHECK-ARMV7THUMB: {{.*}}clang{{.*}}" "-cc1" > // CHECK-ARMV7THUMB: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]" > -// CHECK-ARMV7THUMB: "-internal-isystem" "{{.*}}/include/c++/4.9" > -// CHECK-ARMV7THUMB-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/armv7-a" > -// CHECK-ARMV7THUMB-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/thumb" > -// CHECK-ARMV7THUMB-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi" > -// CHECK-ARMV7THUMB: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/armv7-a/thumb" > -// CHECK-ARMV7THUMB-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/armv7-a" > -// CHECK-ARMV7THUMB-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi/thumb" > -// CHECK-ARMV7THUMB-NOT: "-internal-isystem" > "{{.*}}/include/c++/4.9/arm-linux-androideabi" > -// CHECK-ARMV7THUMB: "-internal-isystem" "{{.*}}/include/c++/4.9/backward" > +// CHECK-ARMV7THUMB: "-internal-isystem" "{{.*}}/include/c++/v1" > // CHECK-ARMV7THUMB: "-internal-isystem" "{{.*}}/sysroot/usr/local/include" > // CHECK-ARMV7THUMB: "-internal-isystem" > "[[RESOURCE_DIR]]{{(/|\\\\)}}include" > // CHECK-ARMV7THUMB: "-internal-externc-isystem" > "{{.*}}/sysroot/usr/include/arm-linux-androideabi" > @@ -191,7 +193,7 @@ > // CHECK-ARMV7THUMB-NOT: "-L{{.*}}/lib/gcc/arm-linux-androideabi/4.9/../{{[^ > ]*}}/lib" > > // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ > -// RUN: -target arm-linux-androideabi21 -stdlib=libstdc++ \ > +// RUN: -target arm-linux-androideabi21 \ > // RUN: -march=armv7-a -mthumb \ > // RUN: -B%S/Inputs/basic_android_ndk_tree \ > // RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \ > @@ -205,21 +207,19 @@ > > // > // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ > -// RUN: -target armv7a-none-linux-androideabi21 -stdlib=libstdc++ \ > +// RUN: -target armv7a-none-linux-androideabi21 \ > // RUN: -mthumb \ > // RUN: -B%S/Inputs/basic_android_ndk_tree \ > // RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \ > // RUN: | FileCheck --check-prefix=CHECK-ARMV7THUMB %s > // > // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ > -// RUN: -target aarch64-linux-android21 -stdlib=libstdc++ \ > +// RUN: -target aarch64-linux-android21 \ > // RUN: -B%S/Inputs/basic_android_ndk_tree \ > // RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \ > // RUN: | FileCheck --check-prefix=CHECK-AARCH64 %s > // CHECK-AARCH64: {{.*}}clang{{.*}}" "-cc1" > -// CHECK-AARCH64: "-internal-isystem" "{{.*}}/include/c++/4.9" > -// CHECK-AARCH64: "-internal-isystem" > "{{.*}}/include/c++/4.9/aarch64-linux-android" > -// CHECK-AARCH64: "-internal-isystem" "{{.*}}/include/c++/4.9/backward" > +// CHECK-AARCH64: "-internal-isystem" "{{.*}}/include/c++/v1" > // CHECK-AARCH64: "-internal-externc-isystem" > "{{.*}}/sysroot/usr/include/aarch64-linux-android" > // CHECK-AARCH64: "-internal-externc-isystem" "{{.*}}/sysroot/include" > // CHECK-AARCH64: "-internal-externc-isystem" "{{.*}}/sysroot/usr/include" > @@ -230,14 +230,12 @@ > // CHECK-AARCH64: > "-L{{.*}}/lib/gcc/aarch64-linux-android/4.9/../../../../aarch64-linux-android/lib" > // > // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ > -// RUN: -target arm64-linux-android21 -stdlib=libstdc++ \ > +// RUN: -target arm64-linux-android21 \ > // RUN: -B%S/Inputs/basic_android_ndk_tree \ > // RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \ > // RUN: | FileCheck --check-prefix=CHECK-ARM64 %s > // CHECK-ARM64: {{.*}}clang{{.*}}" "-cc1" > -// CHECK-ARM64: "-internal-isystem" "{{.*}}/include/c++/4.9" > -// CHECK-ARM64: "-internal-isystem" > "{{.*}}/include/c++/4.9/aarch64-linux-android" > -// CHECK-ARM64: "-internal-isystem" "{{.*}}/include/c++/4.9/backward" > +// CHECK-ARM64: "-internal-isystem" "{{.*}}/include/c++/v1" > // CHECK-ARM64: "-internal-externc-isystem" > "{{.*}}/sysroot/usr/include/aarch64-linux-android" > // CHECK-ARM64: "-internal-externc-isystem" "{{.*}}/sysroot/include" > // CHECK-ARM64: "-internal-externc-isystem" "{{.*}}/sysroot/usr/include" > @@ -249,14 +247,12 @@ > // > // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ > // RUN: -target mipsel-linux-android21 \ > -// RUN: -mips32 -stdlib=libstdc++ \ > +// RUN: -mips32 \ > // RUN: -B%S/Inputs/basic_android_ndk_tree \ > // RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \ > // RUN: | FileCheck --check-prefix=CHECK-MIPS %s > // CHECK-MIPS: {{.*}}clang{{.*}}" "-cc1" > -// CHECK-MIPS: "-internal-isystem" "{{.*}}/include/c++/4.9" > -// CHECK-MIPS: "-internal-isystem" > "{{.*}}/include/c++/4.9/mipsel-linux-android" > -// CHECK-MIPS: "-internal-isystem" "{{.*}}/include/c++/4.9/backward" > +// CHECK-MIPS: "-internal-isystem" "{{.*}}/include/c++/v1" > // CHECK-MIPS: "-internal-externc-isystem" "{{.*}}/sysroot/include" > // CHECK-MIPS: "-internal-externc-isystem" "{{.*}}/sysroot/usr/include" > // CHECK-MIPS: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" > @@ -267,14 +263,11 @@ > // > // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ > // RUN: -target i686-linux-android21 \ > -// RUN: -stdlib=libstdc++ \ > // RUN: -B%S/Inputs/basic_android_ndk_tree \ > // RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \ > // RUN: | FileCheck --check-prefix=CHECK-I686 %s > // CHECK-I686: {{.*}}clang{{.*}}" "-cc1" > -// CHECK-I686: "-internal-isystem" "{{.*}}/include/c++/4.9" > -// CHECK-I686: "-internal-isystem" > "{{.*}}/include/c++/4.9/i686-linux-android" > -// CHECK-I686: "-internal-isystem" "{{.*}}/include/c++/4.9/backward" > +// CHECK-I686: "-internal-isystem" "{{.*}}/include/c++/v1" > // CHECK-I686: "-internal-externc-isystem" > "{{.*}}/sysroot/usr/include/i686-linux-android" > // CHECK-I686: "-internal-externc-isystem" "{{.*}}/sysroot/include" > // CHECK-I686: "-internal-externc-isystem" "{{.*}}/sysroot/usr/include" > @@ -286,14 +279,11 @@ > // > // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ > // RUN: -target x86_64-linux-android21 \ > -// RUN: -stdlib=libstdc++ \ > // RUN: -B%S/Inputs/basic_android_ndk_tree \ > // RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \ > // RUN: | FileCheck --check-prefix=CHECK-X86_64 %s > // CHECK-X86_64: {{.*}}clang{{.*}}" "-cc1" > -// CHECK-X86_64: "-internal-isystem" "{{.*}}/include/c++/4.9" > -// CHECK-X86_64: "-internal-isystem" > "{{.*}}/include/c++/4.9/x86_64-linux-android" > -// CHECK-X86_64: "-internal-isystem" "{{.*}}/include/c++/4.9/backward" > +// CHECK-X86_64: "-internal-isystem" "{{.*}}/include/c++/v1" > // CHECK-X86_64: "-internal-externc-isystem" > "{{.*}}/sysroot/usr/include/x86_64-linux-android" > // CHECK-X86_64: "-internal-externc-isystem" "{{.*}}/sysroot/include" > // CHECK-X86_64: "-internal-externc-isystem" "{{.*}}/sysroot/usr/include" > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
