sgundapa created this revision. sgundapa added reviewers: eugenis, filcab. sgundapa added a subscriber: cfe-commits.
".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. http://reviews.llvm.org/D15577 Files: lib/Driver/Tools.cpp test/Driver/sanitizer-ld.c Index: test/Driver/sanitizer-ld.c =================================================================== --- test/Driver/sanitizer-ld.c +++ 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 Index: lib/Driver/Tools.cpp =================================================================== --- lib/Driver/Tools.cpp +++ lib/Driver/Tools.cpp @@ -10438,7 +10438,7 @@ 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
Index: test/Driver/sanitizer-ld.c =================================================================== --- test/Driver/sanitizer-ld.c +++ 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 Index: lib/Driver/Tools.cpp =================================================================== --- lib/Driver/Tools.cpp +++ lib/Driver/Tools.cpp @@ -10438,7 +10438,7 @@ 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
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits