From 8ca1e470b6e6f3a4e4290c3e37e23dffb55d81a1 Mon Sep 17 00:00:00 2001
From: dim <dim@FreeBSD.org>
Date: Tue, 15 Feb 2011 22:28:15 +0000
Subject: When building libzpool on ia64 or sparc64, don't add the
 .note.GNU-stack section.

Submitted by:	kib
---
 cddl/lib/libzpool/Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'cddl/lib/libzpool')

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
-- 
cgit v1.1