From 2361a394b690d3e69a1bcdafcd850d2f8d2e04a1 Mon Sep 17 00:00:00 2001 From: Manoj Gupta Date: Mon, 15 May 2017 23:13:54 +0000 Subject: 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 --- compiler-rt/lib/builtins/assembly.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'compiler-rt/lib') 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 -- cgit v1.2.3