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.
This commit is contained in:
Warner Losh 2015-11-21 16:37:11 +00:00
parent 722281c070
commit f0e44ca337
2 changed files with 10 additions and 4 deletions

View file

@ -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

View file

@ -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}