maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Re-enable stack depth instrumentation on Windows. 

Specified tls_model attribute properly. Should compile on Windows
now.

llvm-svn: 312037
This commit is contained in:
Matt Morehouse 2017-08-29 21:15:33 +00:00
parent 3bafa546d0
commit 2edac86cdb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Driver/SanitizerArgs.cpp
View File

@ -315,8 +315,8 @@ SanitizerArgs::SanitizerArgs(const ToolChain &TC,
if (Add & FuzzerNoLink) { if (Add & FuzzerNoLink) {
CoverageFeatures |= CoverageTracePCGuard | CoverageIndirCall | CoverageFeatures |= CoverageTracePCGuard | CoverageIndirCall |
CoverageTraceCmp | CoveragePCTable; CoverageTraceCmp | CoveragePCTable;
// Due to TLS differences, stack depth tracking is disabled on Mac/Win. // Due to TLS differences, stack depth tracking is disabled on Mac.
if (!TC.getTriple().isOSDarwin() && !TC.getTriple().isOSWindows()) if (!TC.getTriple().isOSDarwin())
CoverageFeatures |= CoverageStackDepth; CoverageFeatures |= CoverageStackDepth;
} }

4
compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h
View File

@ -36,11 +36,11 @@
#endif #endif
// Mac handles TLS differently // Mac handles TLS differently
#if SANITIZER_MAC || SANITIZER_WINDOWS #if SANITIZER_MAC
# define SANITIZER_TLS_INITIAL_EXEC_ATTRIBUTE # define SANITIZER_TLS_INITIAL_EXEC_ATTRIBUTE
#else #else
# define SANITIZER_TLS_INITIAL_EXEC_ATTRIBUTE \ # define SANITIZER_TLS_INITIAL_EXEC_ATTRIBUTE \
__attribute((tls_model("initial-exec"))) thread_local __attribute__((tls_model("initial-exec"))) thread_local
#endif #endif
//--------------------------- WEAK FUNCTIONS ---------------------------------// //--------------------------- WEAK FUNCTIONS ---------------------------------//