diff options
| author | Manoj Gupta <manojgupta@google.com> | 2017-05-15 23:13:54 +0000 |
|---|---|---|
| committer | Manoj Gupta <manojgupta@google.com> | 2017-05-15 23:13:54 +0000 |
| commit | 0bbb5570008543a77479f2944189a8b508dbe16f (patch) | |
| tree | a3fa4b6141f6b6b2a8114cd79294c6cea8074954 | |
| parent | 4ba4036348a95faa781fa13f0c27ed4b120188fe (diff) | |
Fix executable stack directive on Linux.
Summary: Use __linux__ to check for Linux and bring back the check for __GNU__.
Reviewers: echristo, krytarowski, compnerd, rengolin
Reviewed By: krytarowski
Subscribers: phosek, llvm-commits, srhines
Differential Revision: https://reviews.llvm.org/D33219
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@303131 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/builtins/assembly.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/builtins/assembly.h b/lib/builtins/assembly.h index eafbe7de6..12c13c495 100644 --- a/lib/builtins/assembly.h +++ b/lib/builtins/assembly.h @@ -44,7 +44,8 @@ #endif #define CONST_SECTION .section .rodata -#if defined(__GNUC__) || defined(__ANDROID__) || defined(__FreeBSD__) +#if defined(__GNU__) || defined(__FreeBSD__) || defined(__Fuchsia__) || \ + defined(__linux__) #define NO_EXEC_STACK_DIRECTIVE .section .note.GNU-stack,"",%progbits #else #define NO_EXEC_STACK_DIRECTIVE |