[PATCH] D29655: [X86] Link safestacksepseg runtime

[Michael LeMay via Phabricator via cfe-commits]

mlemay-intel updated this revision to Diff 87932.
mlemay-intel added a comment.

Only link safestacksepseg, not safestack.  I changed the build configuration for safestacksepseg to also include the files in safestack.


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,12 @@
     if (SanArgs.linkCXXRuntimes())
       StaticRuntimes.push_back("ubsan_standalone_cxx");
   }
-  if (SanArgs.needsSafeStackRt())
-    StaticRuntimes.push_back("safestack");
+  if (SanArgs.needsSafeStackRt()) {
+    if (Args.hasFlag(options::OPT_mseparate_stack_seg, options::OPT_mno_separate_stack_seg, false))
+      StaticRuntimes.push_back("safestacksepseg");
+    else
+      StaticRuntimes.push_back("safestack");
+  }
   if (SanArgs.needsCfiRt())
     StaticRuntimes.push_back("cfi");
   if (SanArgs.needsCfiDiagRt()) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D29655.87932.patch
Type: text/x-patch
Size: 699 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20170210/df4d3b44/attachment.bin>