Index: compiler-rt/trunk/lib/xray/xray_trampoline_AArch64.S
===================================================================
--- compiler-rt/trunk/lib/xray/xray_trampoline_AArch64.S
+++ compiler-rt/trunk/lib/xray/xray_trampoline_AArch64.S
@@ -1,3 +1,5 @@
+#include "../builtins/assembly.h"
+
     .text
     /* The variable containing the handler function pointer */
     .global _ZN6__xray19XRayPatchedFunctionE
@@ -138,3 +140,5 @@
     LDP X3, X4, [SP], #16
     LDP X1, X2, [SP], #16
     RET
+
+NO_EXEC_STACK_DIRECTIVE
Index: compiler-rt/trunk/lib/xray/xray_trampoline_arm.S
===================================================================
--- compiler-rt/trunk/lib/xray/xray_trampoline_arm.S
+++ compiler-rt/trunk/lib/xray/xray_trampoline_arm.S
@@ -1,3 +1,5 @@
+#include "../builtins/assembly.h"
+
     .syntax unified
     .arch armv6t2
     .fpu vfpv2
@@ -96,3 +98,5 @@
     @ Restore floating-point parameters of the instrumented function
     VPOP {d0-d7}
     POP {r1-r3,pc}
+
+NO_EXEC_STACK_DIRECTIVE
Index: compiler-rt/trunk/lib/xray/xray_trampoline_x86_64.S
===================================================================
--- compiler-rt/trunk/lib/xray/xray_trampoline_x86_64.S
+++ compiler-rt/trunk/lib/xray/xray_trampoline_x86_64.S
@@ -13,6 +13,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../builtins/assembly.h"
+
 .macro SAVE_REGISTERS
 	subq $200, %rsp
 	movupd	%xmm0, 184(%rsp)
@@ -188,3 +190,5 @@
 .Larg1entryEnd:
 	.size __xray_ArgLoggerEntry, .Larg1entryEnd-__xray_ArgLoggerEntry
 	.cfi_endproc
+
+NO_EXEC_STACK_DIRECTIVE