commit 299238a67bea4a4632ca13739d8db254fc117fc0
author Evgeniy Stepanov <eugeni.stepanov@gmail.com> Thu Sep 24 17:22:46 2015 +0000
committer Evgeniy Stepanov <eugeni.stepanov@gmail.com> Thu Sep 24 17:22:46 2015 +0000
tree 2e2bab3459d305f2f22d0345a237ecc01d66c5ec
parent 8535c6c278b3c54bf6dfa8afbf9d3c0ff63f5bec

Enable SafeStack on all Linux platforms.

llvm-svn: 248518

clang/lib/Driver/ToolChains.cpp

diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index 668fc02..26e7ca6 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -3800,6 +3800,7 @@
   Res |= SanitizerKind::Address;
   Res |= SanitizerKind::KernelAddress;
   Res |= SanitizerKind::Vptr;
+  Res |= SanitizerKind::SafeStack;
   if (IsX86_64 || IsMIPS64 || IsAArch64)
     Res |= SanitizerKind::DataFlow;
   if (IsX86_64 || IsMIPS64)
@@ -3810,7 +3811,6 @@
     Res |= SanitizerKind::Memory;
   if (IsX86 || IsX86_64) {
     Res |= SanitizerKind::Function;
-    Res |= SanitizerKind::SafeStack;
   }
   return Res;
 }

clang/test/Driver/fsanitize.c

diff --git a/clang/test/Driver/fsanitize.c b/clang/test/Driver/fsanitize.c
index 93289ac..1ee90ba 100644
--- a/clang/test/Driver/fsanitize.c
+++ b/clang/test/Driver/fsanitize.c
@@ -282,6 +282,8 @@
 // RUN: %clang -target x86_64-linux-gnu -fsanitize=address,safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP-ASAN
 // RUN: %clang -target x86_64-linux-gnu -fstack-protector -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
 // RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SP
+// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
 // SP-NOT: stack-protector
 // SP: "-fsanitize=safe-stack"
 // SP-ASAN-NOT: stack-protector