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.

2 files changed, 10 insertions, 4 deletions

diff --git a/usr.sbin/Makefile.mips b/usr.sbin/Makefile.mips
index cd60887b5503..8987110dba31 100644
--- a/usr.sbin/Makefile.mips
+++ b/usr.sbin/Makefile.mips
@@ -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
diff --git a/usr.sbin/uathload/Makefile b/usr.sbin/uathload/Makefile
index d7b808cc59e8..949f800ee138 100644
--- a/usr.sbin/uathload/Makefile
+++ b/usr.sbin/uathload/Makefile
@@ -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}