From 2b6ac44d5d1daf1a746ac5b9a9c426b621aaa82b Mon Sep 17 00:00:00 2001
From: kib <kib@FreeBSD.org>
Date: Tue, 29 Sep 2015 16:09:58 +0000
Subject: Annotate arm userspace assembler sources stating their tolerance to
 the non-executable stack.

Reviewed by:	andrew
Sponsored by:	The FreeBSD Foundation
---
 lib/libcompiler_rt/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/libcompiler_rt')

diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile
index 5e21883..22c9f89 100644
--- a/lib/libcompiler_rt/Makefile
+++ b/lib/libcompiler_rt/Makefile
@@ -230,7 +230,7 @@ SYMLINKS+=libcompiler_rt_p.a ${LIBDIR}/libgcc_p.a
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \
-    ${MACHINE_CPUARCH} == "powerpc"
+    ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_ARCH:Marmv6*}
 AFLAGS+=--noexecstack
 ACFLAGS+=-Wa,--noexecstack
 .endif
-- 
cgit v1.1