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 | 2361a394b690d3e69a1bcdafcd850d2f8d2e04a1 (patch) | |
| tree | b8854e47da1dc042162b2de2b13f938de2be4987 | |
| parent | ebbc7159e9b2bee125e819b8da3452fb6b3d5b53 (diff) | |
| download | bcm5719-llvm-2361a394b690d3e69a1bcdafcd850d2f8d2e04a1.tar.gz bcm5719-llvm-2361a394b690d3e69a1bcdafcd850d2f8d2e04a1.zip | |
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
llvm-svn: 303131
| -rw-r--r-- | compiler-rt/lib/builtins/assembly.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler-rt/lib/builtins/assembly.h b/compiler-rt/lib/builtins/assembly.h index eafbe7de619..12c13c49550 100644 --- a/compiler-rt/lib/builtins/assembly.h +++ b/compiler-rt/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 |
