From 65bbd2f5f019454b2bb1801c28f301d2eaef70c9 Mon Sep 17 00:00:00 2001 From: Sumanth Gundapaneni Date: Wed, 16 Dec 2015 20:18:12 +0000 Subject: [PATCH] [PS4] Fix the unit test to be compatible with clang driver. NFC ".exe" extension is inherently checked by llvm::fs::can_execute() This patch fixes the linker extension in clang driver and updates the unit test to accommodate the the check string on windows. Differential Revision:http://reviews.llvm.org/D15577 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@255814 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Tools.cpp | 2 +- test/Driver/sanitizer-ld.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index dc125d6389..41a4e9a51c 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -10440,7 +10440,7 @@ static void ConstructGoldLinkJob(const Tool &T, Compilation &C, const char *Exec = #ifdef LLVM_ON_WIN32 - Args.MakeArgString(ToolChain.GetProgramPath("ps4-ld.gold.exe")); + Args.MakeArgString(ToolChain.GetProgramPath("ps4-ld.gold")); #else Args.MakeArgString(ToolChain.GetProgramPath("ps4-ld")); #endif diff --git a/test/Driver/sanitizer-ld.c b/test/Driver/sanitizer-ld.c index ad30ca390d..4a9b2f7471 100644 --- a/test/Driver/sanitizer-ld.c +++ b/test/Driver/sanitizer-ld.c @@ -379,19 +379,19 @@ // RUN: -target x86_64-scei-ps4 \ // RUN: -shared \ // RUN: | FileCheck --check-prefix=CHECK-UBSAN-PS4 %s -// CHECK-UBSAN-PS4: "{{.*}}ld{{(.exe)?}}" +// CHECK-UBSAN-PS4: "{{.*}}ld{{(.gold)?(.exe)?}}" // CHECK-UBSAN-PS4: -lSceDbgUBSanitizer_stub_weak // RUN: %clang -fsanitize=address %s -### -o %t.o 2>&1 \ // RUN: -target x86_64-scei-ps4 \ // RUN: -shared \ // RUN: | FileCheck --check-prefix=CHECK-ASAN-PS4 %s -// CHECK-ASAN-PS4: "{{.*}}ld{{(.exe)?}}" +// CHECK-ASAN-PS4: "{{.*}}ld{{(.gold)?(.exe)?}}" // CHECK-ASAN-PS4: -lSceDbgAddressSanitizer_stub_weak // RUN: %clang -fsanitize=address,undefined %s -### -o %t.o 2>&1 \ // RUN: -target x86_64-scei-ps4 \ // RUN: -shared \ // RUN: | FileCheck --check-prefix=CHECK-AUBSAN-PS4 %s -// CHECK-AUBSAN-PS4: "{{.*}}ld{{(.exe)?}}" +// CHECK-AUBSAN-PS4: "{{.*}}ld{{(.gold)?(.exe)?}}" // CHECK-AUBSAN-PS4: -lSceDbgAddressSanitizer_stub_weak -- 2.40.0