summaryrefslogtreecommitdiffstats
path: root/cddl/lib
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2011-02-15 22:28:15 +0000
committerdim <dim@FreeBSD.org>2011-02-15 22:28:15 +0000
commit8ca1e470b6e6f3a4e4290c3e37e23dffb55d81a1 (patch)
treec990e8e7ecdb6b3b0013abe2e7f1da2212b60bba /cddl/lib
parent9cea8aad2d5c64a42cc730b5697ddf9dd8d67398 (diff)
downloadFreeBSD-src-8ca1e470b6e6f3a4e4290c3e37e23dffb55d81a1.zip
FreeBSD-src-8ca1e470b6e6f3a4e4290c3e37e23dffb55d81a1.tar.gz
When building libzpool on ia64 or sparc64, don't add the .note.GNU-stack
section. Submitted by: kib
Diffstat (limited to 'cddl/lib')
-rw-r--r--cddl/lib/libzpool/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index bdd9ecd..7e2841a 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -14,7 +14,9 @@
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "powerpc64"
.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
ATOMIC_SRCS= opensolaris_atomic.S
+.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "sparc64"
ACFLAGS+= -Wa,--noexecstack
+.endif
.else
.PATH: ${.CURDIR}/../../../sys/cddl/compat/opensolaris/kern
ATOMIC_SRCS= opensolaris_atomic.c
OpenPOWER on IntegriCloud