svn commit: r218725 - head/cddl/lib/libzpool

Dimitry Andric dim at FreeBSD.org
Tue Feb 15 22:28:16 UTC 2011


Author: dim
Date: Tue Feb 15 22:28:15 2011
New Revision: 218725
URL: http://svn.freebsd.org/changeset/base/218725

Log:
  When building libzpool on ia64 or sparc64, don't add the .note.GNU-stack
  section.
  
  Submitted by:	kib

Modified:
  head/cddl/lib/libzpool/Makefile

Modified: head/cddl/lib/libzpool/Makefile
==============================================================================
--- head/cddl/lib/libzpool/Makefile	Tue Feb 15 22:17:47 2011	(r218724)
+++ head/cddl/lib/libzpool/Makefile	Tue Feb 15 22:28:15 2011	(r218725)
@@ -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


More information about the svn-src-all mailing list