From: Vasileios Kalintiris Date: Fri, 30 Oct 2015 10:35:38 +0000 (+0000) Subject: Try to run and investigate the mips-mti-linux.c test failure on ARM buildbots. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d07a67d27753c3c3f08ceec87edc6620d7b7698;p=clang Try to run and investigate the mips-mti-linux.c test failure on ARM buildbots. This should be a NFC for every toolchain other than mips-mti-linux (where we print the list of directories searched for crt files). It will soon be reverted once we hit the clang-cmake-armv7-a15-selfhost-neon buildbot. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@251695 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index dc11316cdc..8da91d5f24 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -8469,6 +8469,19 @@ void gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crt1))); CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crti.o"))); + + if (ToolChain.getTriple().getVendor() == llvm::Triple::MipsTechnologies && + !ToolChain.getTriple().hasEnvironment()) { + // Print look-up paths for crt files. + llvm::errs() << "Looked for crti.o in: "; + llvm::errs() << "#### PrefixDirs #### - "; + for (const std::string &Dir : D.PrefixDirs) + llvm::errs() << "Dir: " << Dir << ", "; + llvm::errs() << "#### TC.getFilePaths() #### - "; + for (const std::string &Dir : ToolChain.getFilePaths()) + llvm::errs() << "Dir: " << Dir << ","; + llvm::errs() << "\n"; + } } const char *crtbegin; diff --git a/test/Driver/mips-mti-linux.c b/test/Driver/mips-mti-linux.c index c973ed2822..c19e532884 100644 --- a/test/Driver/mips-mti-linux.c +++ b/test/Driver/mips-mti-linux.c @@ -5,14 +5,15 @@ // Ideally, we'd like to have an --llvm-toolchain option similar to // the --gcc-toolchain one. -// RUN: false -// XFAIL: * +// XFAIL: i386, i686, x86_64, win32, win64, powerpc64, s390x, r600, xcore, hexagon, sparc, darwin, asan, msan // = Big-endian, mips32r2, hard float -// R!N: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ -// R!N: --target=mips-mti-linux -mips32r2 -mhard-float \ -// R!N: --sysroot=%S/Inputs/mips_mti_linux/sysroot \ -// R!N: | FileCheck --check-prefix=CHECK-BE-HF-32R2 %s +// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +// RUN: --target=mips-mti-linux -mips32r2 -mhard-float \ +// RUN: --sysroot=%S/Inputs/mips_mti_linux/sysroot \ +// RUN: | FileCheck --check-prefix=CHECK-BE-HF-32R2 %s +// +// CHECK-BE-HF-32R2: Looked for crt1.o // // CHECK-BE-HF-32R2: "{{[^"]*}}clang{{[^"]*}}" {{.*}} "-triple" "mips-mti-linux" // CHECK-BE-HF-32R2-SAME: "-fuse-init-array" "-target-cpu" "mips32r2"