<div dir="ltr">On Fri, Aug 5, 2016 at 2:35 PM, Saleem Abdulrasool via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: compnerd<br>
Date: Fri Aug  5 16:35:28 2016<br>
New Revision: 277868<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=277868&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=277868&view=rev</a><br>
Log:<br>
unwind: disable executable stacks<br>
<br>
Similar to compiler-rt, ensure that we disable executable stacks for the custom<br>
assembly.<br></blockquote><div><br></div><div>Hi Hans,</div><div><br></div><div>I think that we should get this merged into 3.9.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Modified:<br>
    libunwind/trunk/src/<wbr>UnwindRegistersRestore.S<br>
    libunwind/trunk/src/<wbr>UnwindRegistersSave.S<br>
    libunwind/trunk/src/assembly.h<br>
<br>
Modified: libunwind/trunk/src/<wbr>UnwindRegistersRestore.S<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/libunwind/trunk/src/UnwindRegistersRestore.S?rev=277868&r1=277867&r2=277868&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/libunwind/trunk/src/<wbr>UnwindRegistersRestore.S?rev=<wbr>277868&r1=277867&r2=277868&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- libunwind/trunk/src/<wbr>UnwindRegistersRestore.S (original)<br>
+++ libunwind/trunk/src/<wbr>UnwindRegistersRestore.S Fri Aug  5 16:35:28 2016<br>
@@ -488,3 +488,6 @@ DEFINE_LIBUNWIND_PRIVATE_<wbr>FUNCTION(_ZN9li<br>
    l.nop<br>
<br>
 #endif<br>
+<br>
+NO_EXEC_STACK_DIRECTIVE<br>
+<br>
<br>
Modified: libunwind/trunk/src/<wbr>UnwindRegistersSave.S<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/libunwind/trunk/src/UnwindRegistersSave.S?rev=277868&r1=277867&r2=277868&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/libunwind/trunk/src/<wbr>UnwindRegistersSave.S?rev=<wbr>277868&r1=277867&r2=277868&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- libunwind/trunk/src/<wbr>UnwindRegistersSave.S (original)<br>
+++ libunwind/trunk/src/<wbr>UnwindRegistersSave.S Fri Aug  5 16:35:28 2016<br>
@@ -468,3 +468,6 @@ DEFINE_LIBUNWIND_FUNCTION(unw_<wbr>getcontext<br>
   l.sw     120(r3), r30<br>
   l.sw     124(r3), r31<br>
 #endif<br>
+<br>
+NO_EXEC_STACK_DIRECTIVE<br>
+<br>
<br>
Modified: libunwind/trunk/src/assembly.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/libunwind/trunk/src/assembly.h?rev=277868&r1=277867&r2=277868&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/libunwind/trunk/src/<wbr>assembly.h?rev=277868&r1=<wbr>277867&r2=277868&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- libunwind/trunk/src/assembly.h (original)<br>
+++ libunwind/trunk/src/assembly.h Fri Aug  5 16:35:28 2016<br>
@@ -35,19 +35,34 @@<br>
 #define SYMBOL_NAME(name) GLUE(__USER_LABEL_PREFIX__, name)<br>
<br>
 #if defined(__APPLE__)<br>
+<br>
 #define SYMBOL_IS_FUNC(name)<br>
+#define NO_EXEC_STACK_DIRECTIVE<br>
+<br>
 #elif defined(__ELF__)<br>
+<br>
 #if defined(__arm__)<br>
 #define SYMBOL_IS_FUNC(name) .type name,%function<br>
 #else<br>
 #define SYMBOL_IS_FUNC(name) .type name,@function<br>
 #endif<br>
+<br>
+#if defined(__GNU__) || defined(__ANDROID__) || defined(__FreeBSD__)<br>
+#define NO_EXEC_STACK_DIRECTIVE .section .note.GNU-stack,"",%progbits<br>
+#else<br>
+#define NO_EXEC_STACK_DIRECTIVE<br>
+#endif<br>
+<br>
 #else<br>
+<br>
 #define SYMBOL_IS_FUNC(name)                                                   \<br>
   .def name SEPARATOR                                                          \<br>
     .scl 2 SEPARATOR                                                           \<br>
     .type 32 SEPARATOR                                                         \<br>
   .endef<br>
+<br>
+#define NO_EXEC_STACK_DIRECTIVE<br>
+<br>
 #endif<br>
<br>
 #define DEFINE_LIBUNWIND_FUNCTION(<wbr>name)                   \<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature" data-smartmail="gmail_signature">Saleem Abdulrasool<br>compnerd (at) compnerd (dot) org</div>
</div></div>