diff options
| author | Petr Hosek <phosek@chromium.org> | 2017-08-16 19:06:05 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2017-08-16 19:06:05 +0000 |
| commit | 766288b191c1a393130f2ec953827f95454a945a (patch) | |
| tree | 09d469fa730396d36cfadd3d25585678c1c1c52e | |
| parent | 1ed7135e6575e90184516586d9a1becb114ad703 (diff) | |
| download | bcm5719-llvm-766288b191c1a393130f2ec953827f95454a945a.tar.gz bcm5719-llvm-766288b191c1a393130f2ec953827f95454a945a.zip | |
[Driver] SafeStack does not need a runtime library on Fuchsia
Patch by Roland McGrath
Differential Revision: https://reviews.llvm.org/D36779
llvm-svn: 311034
| -rw-r--r-- | clang/include/clang/Driver/SanitizerArgs.h | 5 | ||||
| -rw-r--r-- | clang/lib/Driver/SanitizerArgs.cpp | 5 | ||||
| -rw-r--r-- | clang/test/Driver/fuchsia.c | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/clang/include/clang/Driver/SanitizerArgs.h b/clang/include/clang/Driver/SanitizerArgs.h index a9645d463fa..b6154da50ae 100644 --- a/clang/include/clang/Driver/SanitizerArgs.h +++ b/clang/include/clang/Driver/SanitizerArgs.h @@ -38,6 +38,7 @@ class SanitizerArgs { bool AsanGlobalsDeadStripping = false; bool LinkCXXRuntimes = false; bool NeedPIE = false; + bool SafeStackRuntime = false; bool Stats = false; bool TsanMemoryAccess = true; bool TsanFuncEntryExit = true; @@ -58,9 +59,7 @@ class SanitizerArgs { } bool needsUbsanRt() const; bool needsDfsanRt() const { return Sanitizers.has(SanitizerKind::DataFlow); } - bool needsSafeStackRt() const { - return Sanitizers.has(SanitizerKind::SafeStack); - } + bool needsSafeStackRt() const { return SafeStackRuntime; } bool needsCfiRt() const; bool needsCfiDiagRt() const; bool needsStatsRt() const { return Stats; } diff --git a/clang/lib/Driver/SanitizerArgs.cpp b/clang/lib/Driver/SanitizerArgs.cpp index e411629ca42..0a737756d90 100644 --- a/clang/lib/Driver/SanitizerArgs.cpp +++ b/clang/lib/Driver/SanitizerArgs.cpp @@ -605,6 +605,11 @@ SanitizerArgs::SanitizerArgs(const ToolChain &TC, AsanUseAfterScope = false; } + if (AllAddedKinds & SafeStack) { + // SafeStack runtime is built into the system on Fuchsia. + SafeStackRuntime = !TC.getTriple().isOSFuchsia(); + } + // Parse -link-cxx-sanitizer flag. LinkCXXRuntimes = Args.hasArg(options::OPT_fsanitize_link_cxx_runtime) || D.CCCIsCXX(); diff --git a/clang/test/Driver/fuchsia.c b/clang/test/Driver/fuchsia.c index 5b61bf424f5..a5491c4ab97 100644 --- a/clang/test/Driver/fuchsia.c +++ b/clang/test/Driver/fuchsia.c @@ -45,6 +45,8 @@ // RUN: -fsanitize=safe-stack 2>&1 \ // RUN: | FileCheck %s -check-prefix=CHECK-SAFESTACK // CHECK-SAFESTACK: "-fsanitize=safe-stack" +// CHECK-SAFESTACK-NOT: "{{.*[/\\]}}libclang_rt.safestack-x86_64.a" +// CHECK-SAFESTACK-NOT: "__safestack_init" // RUN: %clang %s -### --target=x86_64-unknown-fuchsia \ // RUN: -fsanitize=address 2>&1 \ |
