From 4f4b142134786d73a29ffe5a06b5c1bdd1584132 Mon Sep 17 00:00:00 2001 From: Renato Golin Date: Fri, 30 Oct 2015 11:12:36 +0000 Subject: [PATCH] Revert "Try to run and investigate the mips-mti-linux.c test failure on ARM buildbots." This reverts commit r251695. Debug is meant to be done off tree, not use the buildbots experiments. I'll help investigate this problem off trunk. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@251696 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Tools.cpp | 13 ------------- test/Driver/mips-mti-linux.c | 13 ++++++------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 8da91d5f24..dc11316cdc 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -8469,19 +8469,6 @@ 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 c19e532884..c973ed2822 100644 --- a/test/Driver/mips-mti-linux.c +++ b/test/Driver/mips-mti-linux.c @@ -5,15 +5,14 @@ // Ideally, we'd like to have an --llvm-toolchain option similar to // the --gcc-toolchain one. -// XFAIL: i386, i686, x86_64, win32, win64, powerpc64, s390x, r600, xcore, hexagon, sparc, darwin, asan, msan +// RUN: false +// XFAIL: * // = Big-endian, mips32r2, hard float -// 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 +// 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 // // CHECK-BE-HF-32R2: "{{[^"]*}}clang{{[^"]*}}" {{.*}} "-triple" "mips-mti-linux" // CHECK-BE-HF-32R2-SAME: "-fuse-init-array" "-target-cpu" "mips32r2" -- 2.40.0