[PATCH] D29655: [X86] Link safestacksepseg runtime

[Michael LeMay via Phabricator via llvm-commits]

mlemay-intel created this revision.

When SafeStack and the separate-stack-seg feature are both enabled, link the
safestacksepseg runtime library.


https://reviews.llvm.org/D29655

Files:
  lib/Driver/Tools.cpp


Index: lib/Driver/Tools.cpp
===================================================================
--- lib/Driver/Tools.cpp
+++ lib/Driver/Tools.cpp
@@ -3319,8 +3319,11 @@
     if (SanArgs.linkCXXRuntimes())
       StaticRuntimes.push_back("ubsan_standalone_cxx");
   }
-  if (SanArgs.needsSafeStackRt())
+  if (SanArgs.needsSafeStackRt()) {
     StaticRuntimes.push_back("safestack");
+    if (Args.hasFlag(options::OPT_mseparate_stack_seg, options::OPT_mno_separate_stack_seg, false))
+      StaticRuntimes.push_back("safestacksepseg");
+  }
   if (SanArgs.needsCfiRt())
     StaticRuntimes.push_back("cfi");
   if (SanArgs.needsCfiDiagRt()) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D29655.87455.patch
Type: text/x-patch
Size: 643 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170207/cfa8aeba/attachment.bin>