[compiler-rt] r298545 - Use lld-link /nopdb to suppress PDB generation when DWARF is required

[Reid Kleckner via llvm-commits]

Author: rnk
Date: Wed Mar 22 14:49:29 2017
New Revision: 298545

URL: http://llvm.org/viewvc/llvm-project?rev=298545&view=rev
Log:
Use lld-link /nopdb to suppress PDB generation when DWARF is required

Fixes cfi/stats.cpp and asan/fuse-lld.cc on Windows.

Modified:
    compiler-rt/trunk/test/asan/TestCases/Windows/fuse-lld.cc
    compiler-rt/trunk/test/cfi/stats.cpp
    compiler-rt/trunk/test/lit.common.cfg

Modified: compiler-rt/trunk/test/asan/TestCases/Windows/fuse-lld.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Windows/fuse-lld.cc?rev=298545&r1=298544&r2=298545&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Windows/fuse-lld.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Windows/fuse-lld.cc Wed Mar 22 14:49:29 2017
@@ -5,8 +5,8 @@
 // FIXME: Use -fuse-ld=lld after the old COFF linker is removed.
 // FIXME: Test will fail until we add flags for requesting dwarf or cv.
 // RUNX: %clangxx_asan -O2 %s -o %t.exe -fuse-ld=lld -Wl,-debug
-// RUN: %clangxx_asan -c -O2 %s -o %t.o -gdwarf
-// RUN: lld-link %t.o -out:%t.exe -debug -defaultlib:libcmt %asan_lib %asan_cxx_lib
+// RUN: %clangxx_asan -c -O2 %s -o %t.o -g -gdwarf
+// RUN: lld-link %t.o -out:%t.exe -debug -nopdb -defaultlib:libcmt %asan_lib %asan_cxx_lib
 // RUN: not %run %t.exe 2>&1 | FileCheck %s
 
 #include <stdlib.h>

Modified: compiler-rt/trunk/test/cfi/stats.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/cfi/stats.cpp?rev=298545&r1=298544&r2=298545&view=diff
==============================================================================
--- compiler-rt/trunk/test/cfi/stats.cpp (original)
+++ compiler-rt/trunk/test/cfi/stats.cpp Wed Mar 22 14:49:29 2017
@@ -2,8 +2,6 @@
 // RUN: env SANITIZER_STATS_PATH=%t.stats %t
 // RUN: sanstats %t.stats | FileCheck %s
 
-// XFAIL: win32
-
 // FIXME: We currently emit the wrong debug info under devirtualization.
 // UNSUPPORTED: devirt
 

Modified: compiler-rt/trunk/test/lit.common.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/lit.common.cfg?rev=298545&r1=298544&r2=298545&view=diff
==============================================================================
--- compiler-rt/trunk/test/lit.common.cfg (original)
+++ compiler-rt/trunk/test/lit.common.cfg Wed Mar 22 14:49:29 2017
@@ -195,7 +195,8 @@ elif config.host_os == 'Linux' and is_li
 elif config.host_os == 'Windows' and is_windows_lto_supported():
   config.lto_supported = True
   config.lto_launch = []
-  config.lto_flags = ["-fuse-ld=lld"]
+  # FIXME: Remove -nopdb when PDB writing is ready.
+  config.lto_flags = ["-fuse-ld=lld -Wl,-nopdb"]
 else:
   config.lto_supported = False