[MinGW] Fix passing a sanitizer lib name as dependent lib

[smeenai]

lib/Driver/ToolChains/MinGW.cpp

266 ↗

(On Diff #168672)

Isn't Windows 7 our minimum supported Windows version anyway? I can't find the documentation pointing to that, but I thought that was the policy. In particular, we require VS 2015 or above, which doesn't support anything older than Server 2008 anyway (including Vista and XP), and I doubt we'd have anyone using Server 2008.

[mstorsjo]

lib/Driver/ToolChains/MinGW.cpp

266 ↗

(On Diff #168672)

For llvm itself, yes, but this is for the runtimes. Or does the policy cover that as well?

Mingw upstream still(!) default to supporting xp onwards, while I'm configuring my own setups to default to vista. I guess making that 7 wouldn't be too much of an issue though.

FWIW, I included a corresponding change for ASAN here: https://reviews.llvm.org/rCRT343074, in adding a append_list_if(MINGW psapi ASAN_DYNAMIC_LIBS) in compiler-rt/trunk/lib/asan/CMakeLists.txt.

[rnk]

lib/Driver/ToolChains/MinGW.cpp

266 ↗

(On Diff #168672)

I think most of our policies have to do with LLVM's own build requirements. Clang has supported targeting older OSs for a while, and we shouldn't intentionally break it, at least. We probably don't want to support running the sanitizers on old Windows OSs, since they tend to want to use modern OS APIs. For example, I used the slim reader writer lock APIs in ASan to fix a race.

In any case, do you think it would be nicer to put this directive in the ubsan object files that use psapi? It seems lame for clang to have to know about what libraries the sanitizers use.

[smeenai]

lib/Driver/ToolChains/MinGW.cpp

266 ↗

(On Diff #168672)

Ah, I wasn't thinking of the LLVM/runtimes distinction. SRWLocks would require Vista and above though, and at that point just going for 7 and above would make sense.

This is a bit orthogonal to the patch though, so sorry for side-tracking things. +1 for Reid's suggestion of embedding the psapi directive in object files.

[mstorsjo]

lib/Driver/ToolChains/MinGW.cpp

266 ↗

(On Diff #168672)

We probably don't want to support running the sanitizers on old Windows OSs, since they tend to want to use modern OS APIs. For example, I used the slim reader writer lock APIs in ASan to fix a race.

Yes, I've tried to keep things simple by requiring Vista in a number of other places as well, especially for SRWLocks and other threading related things. Since Vista is pretty much extinct, requiring 7 wouldn't be that big of a change though. I have no intention of trying to support sanitizers on anything older than that.

In any case, do you think it would be nicer to put this directive in the ubsan object files that use psapi? It seems lame for clang to have to know about what libraries the sanitizers use.

It would definitely be nicer - I'll have a shot at doing that.

[mstorsjo]

Relying on a linker pragma in sanitizers and mingw lib name logic in lld.

[rnk]

lgtm

lib/CodeGen/TargetInfo.cpp

 
 static std::string qualifyWindowsLibrary(llvm::StringRef Lib) {
   // If the argument does not end in .lib, automatically add the suffix.
   // If the argument contains a space, enclose it in quotes.
   // This matches the behavior of MSVC.
   bool Quote = (Lib.find(" ") != StringRef::npos);
   std::string ArgStr = Quote ? "\"" : "";
   ArgStr += Lib;
-  if (!Lib.endswith_lower(".lib"))
+  if (!Lib.endswith_lower(".lib") && !Lib.endswith_lower(".a"))
     ArgStr += ".lib";
   ArgStr += Quote ? "\"" : "";
   return ArgStr;
 }
 
 class WinX86_32TargetCodeGenInfo : public X86_32TargetCodeGenInfo {
 public:
   WinX86_32TargetCodeGenInfo(CodeGen::CodeGenTypes &CGT,

test/Driver/fsanitize.c

 // CHECK-UNDEFINED: "-fsanitize={{((signed-integer-overflow|integer-divide-by-zero|float-divide-by-zero|function|shift-base|shift-exponent|unreachable|return|vla-bound|alignment|null|vptr|pointer-overflow|float-cast-overflow|array-bounds|enum|bool|builtin|returns-nonnull-attribute|nonnull-attribute),?){20}"}}
 
 // RUN: %clang -target x86_64-apple-darwin10 -fsanitize=undefined %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-UNDEFINED-DARWIN
 // CHECK-UNDEFINED-DARWIN: "-fsanitize={{((signed-integer-overflow|integer-divide-by-zero|float-divide-by-zero|function|shift-base|shift-exponent|unreachable|return|vla-bound|alignment|null|pointer-overflow|float-cast-overflow|array-bounds|enum|bool|builtin|returns-nonnull-attribute|nonnull-attribute),?){19}"}}
 
 // RUN: %clang -target i386-pc-win32 -fsanitize=undefined %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-UNDEFINED-WIN --check-prefix=CHECK-UNDEFINED-WIN32
 // RUN: %clang -target i386-pc-win32 -fsanitize=undefined -x c++ %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-UNDEFINED-WIN --check-prefix=CHECK-UNDEFINED-WIN32 --check-prefix=CHECK-UNDEFINED-WIN-CXX
 // RUN: %clang -target x86_64-pc-win32 -fsanitize=undefined %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-UNDEFINED-WIN --check-prefix=CHECK-UNDEFINED-WIN64
+// RUN: %clang -target x86_64-w64-mingw32 -fsanitize=undefined %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-UNDEFINED-WIN --check-prefix=CHECK-UNDEFINED-WIN64-MINGW
 // RUN: %clang -target x86_64-pc-win32 -fsanitize=undefined -x c++ %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-UNDEFINED-WIN --check-prefix=CHECK-UNDEFINED-WIN64 --check-prefix=CHECK-UNDEFINED-WIN-CXX
 // CHECK-UNDEFINED-WIN32: "--dependent-lib={{[^"]*}}ubsan_standalone-i386.lib"
 // CHECK-UNDEFINED-WIN64: "--dependent-lib={{[^"]*}}ubsan_standalone-x86_64.lib"
+// CHECK-UNDEFINED-WIN64-MINGW: "--dependent-lib={{[^"]*}}libclang_rt.ubsan_standalone-x86_64.a"
 // CHECK-UNDEFINED-WIN-CXX: "--dependent-lib={{[^"]*}}ubsan_standalone_cxx{{[^"]*}}.lib"
 // CHECK-UNDEFINED-WIN-SAME: "-fsanitize={{((signed-integer-overflow|integer-divide-by-zero|float-divide-by-zero|shift-base|shift-exponent|unreachable|return|vla-bound|alignment|null|pointer-overflow|float-cast-overflow|array-bounds|enum|bool|builtin|returns-nonnull-attribute|nonnull-attribute),?){18}"}}
 
 // RUN: %clang -target i386-pc-win32 -fsanitize-coverage=bb %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-COVERAGE-WIN32
 // CHECK-COVERAGE-WIN32: "--dependent-lib={{[^"]*}}ubsan_standalone-i386.lib"
 // RUN: %clang -target x86_64-pc-win32 -fsanitize-coverage=bb %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-COVERAGE-WIN64
 // CHECK-COVERAGE-WIN64: "--dependent-lib={{[^"]*}}ubsan_standalone-x86_64.lib"