<rdar://problem/7813254> check enable_execute_stack implementation
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@100036 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/enable_execute_stack.c b/lib/enable_execute_stack.c
index b349d2f..193e7db 100644
--- a/lib/enable_execute_stack.c
+++ b/lib/enable_execute_stack.c
@@ -21,6 +21,11 @@
#include <unistd.h>
#endif /* __APPLE__ */
+#if __LP64__
+ #define TRAMPOLINE_SIZE 48
+#else
+ #define TRAMPOLINE_SIZE 40
+#endif
/*
* The compiler generates calls to __enable_execute_stack() when creating
@@ -45,7 +50,7 @@
const uintptr_t pageAlignMask = ~(pageSize-1);
uintptr_t p = (uintptr_t)addr;
unsigned char* startPage = (unsigned char*)(p & pageAlignMask);
- unsigned char* endPage = (unsigned char*)((p+48+pageSize) & pageAlignMask);
+ unsigned char* endPage = (unsigned char*)((p+TRAMPOLINE_SIZE+pageSize) & pageAlignMask);
size_t length = endPage - startPage;
(void) mprotect((void *)startPage, length, PROT_READ | PROT_WRITE | PROT_EXEC);
}