Index: head/lib/libcompiler_rt/Makefile
===================================================================
--- head/lib/libcompiler_rt/Makefile	(revision 314151)
+++ head/lib/libcompiler_rt/Makefile	(revision 314152)
@@ -1,34 +1,28 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PACKAGE=	lib${LIB}
 LIB=		compiler_rt
 NO_PIC=
 WARNS?=		2
 
 CFLAGS+=	${PICFLAG}
 CFLAGS+=	-fvisibility=hidden
 CFLAGS+=	-DVISIBILITY_HIDDEN
 CFLAGS+=	-I${SRCTOP}/contrib/libcxxrt
 
 .if ${COMPILER_TYPE} == "clang"
 CWARNFLAGS.gcc_personality_v0.c+= -Wno-typedef-redefinition
 .endif
 
 .include "Makefile.inc"
 
 .if ${MK_INSTALLLIB} != "no"
 SYMLINKS+=	libcompiler_rt.a ${LIBDIR}/libgcc.a
 .endif
 .if ${MK_PROFILE} != "no"
 SYMLINKS+=	libcompiler_rt_p.a ${LIBDIR}/libgcc_p.a
 .endif
 
-.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \
-    ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_ARCH:Marmv6*}
-AFLAGS+=	--noexecstack
-ACFLAGS+=	-Wa,--noexecstack
-.endif
-
 .include <bsd.lib.mk>