Date: Sat, 21 Nov 2015 16:37:12 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291139 - in head/usr.sbin: . uathload Message-ID: <201511211637.tALGbCO4093156@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Sat Nov 21 16:37:11 2015 New Revision: 291139 URL: https://svnweb.freebsd.org/changeset/base/291139 Log: Document why we use -z nonexecstack in the Makefile since it is so unusual. Turn off mis-match warnings for building uathload because the firmware .o file is produced in a way that we can't get to match exactly. This fixes the build on mips, so stop excluding it from the build. Modified: head/usr.sbin/Makefile.mips head/usr.sbin/uathload/Makefile Modified: head/usr.sbin/Makefile.mips ============================================================================== --- head/usr.sbin/Makefile.mips Sat Nov 21 16:32:14 2015 (r291138) +++ head/usr.sbin/Makefile.mips Sat Nov 21 16:37:11 2015 (r291139) @@ -1,7 +1,3 @@ # $FreeBSD$ SUBDIR+= ofwdump -# uathload broken for n32 and n64 due to toolchain issues, only build for o32 -.if ${MACHINE_ARCH} != "mips" && ${MACHINE_ARCH} != "mipsel" -SUBDIR.yes:= ${SUBDIR.yes:Nuathload} -.endif Modified: head/usr.sbin/uathload/Makefile ============================================================================== --- head/usr.sbin/uathload/Makefile Sat Nov 21 16:32:14 2015 (r291138) +++ head/usr.sbin/uathload/Makefile Sat Nov 21 16:37:11 2015 (r291139) @@ -7,10 +7,20 @@ SRCS= uathload.c ar5523.bin CLEANFILES= ar5523.bin +# It's hard to tag ar5523.o with the proper gnu note saying that it has a +# non-executable stack, so ld doesn't properly mark his executable as +# not having an executable stack. Mark it explicitly, but only for those +# platforms that support his feature (otherwise signals don't work). +# Note: Newer versions of ld than is in the tree ignore -z. .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64" LDFLAGS+= -Wl,-z,noexecstack .endif +# The conversion from .bin to .o doesn't always produce a pedantically correct +# .o's. And it doesn't matter, so turn off the mismatch warnings since it is +# pure data. On mips64 here's no easy way to produce a proper .o. +LDFLAGS+= -Wl,--no-warn-mismatch + ar5523.bin: ${.CURDIR}/../../sys/contrib/dev/uath/ar5523.bin.uu uudecode -p ${.CURDIR}/../../sys/contrib/dev/uath/ar5523.bin.uu > ${.TARGET}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511211637.tALGbCO4093156>