[Midnightbsd-cvs] src [9732] trunk/sys/boot/i386/zfsboot: update for clang 3.4

[laffer1 at midnightbsd.org]

Revision: 9732
          http://svnweb.midnightbsd.org/src/?rev=9732
Author:   laffer1
Date:     2017-12-22 15:46:08 -0500 (Fri, 22 Dec 2017)
Log Message:
-----------
update for clang 3.4

Modified Paths:
--------------
    trunk/sys/boot/i386/zfsboot/Makefile
    trunk/sys/boot/i386/zfsboot/zfsboot.c

Modified: trunk/sys/boot/i386/zfsboot/Makefile
===================================================================
--- trunk/sys/boot/i386/zfsboot/Makefile	2017-12-22 20:41:18 UTC (rev 9731)
+++ trunk/sys/boot/i386/zfsboot/Makefile	2017-12-22 20:46:08 UTC (rev 9732)
@@ -1,8 +1,10 @@
 # $MidnightBSD$
+# $FreeBSD: stable/9/sys/boot/i386/zfsboot/Makefile 272697 2014-10-07 13:37:10Z avg $
 
 .PATH:		${.CURDIR}/../boot2 ${.CURDIR}/../common ${.CURDIR}/../../common
 
 FILES=		zfsboot
+MAN=		zfsboot.8
 
 NM?=		nm
 
@@ -29,10 +31,12 @@
 	-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
 	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-	-Winline --param max-inline-insns-single=100
+	-Winline
 
-LDFLAGS=-static -N --gc-sections
+CFLAGS.gcc+=	--param max-inline-insns-single=100
 
+LD_FLAGS=-static -N --gc-sections
+
 # Pick up ../Makefile.inc early.
 .include <bsd.init.mk>
 
@@ -47,7 +51,7 @@
 	objcopy -S -O binary zfsldr.out ${.TARGET}
 
 zfsldr.out: zfsldr.o
-	${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} zfsldr.o
+	${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} zfsldr.o
 
 CLEANFILES+=	zfsboot2 zfsboot.ld zfsboot.ldr zfsboot.bin zfsboot.out \
 		zfsboot.o zfsboot.s zfsboot.s.tmp sio.o cons.o drv.o util.o
@@ -73,7 +77,7 @@
 	objcopy -S -O binary zfsboot.out ${.TARGET}
 
 zfsboot.out: ${BTXCRT} zfsboot.o sio.o drv.o cons.o util.o
-	${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
+	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
 
 SRCS=	zfsboot.c
 

Modified: trunk/sys/boot/i386/zfsboot/zfsboot.c
===================================================================
--- trunk/sys/boot/i386/zfsboot/zfsboot.c	2017-12-22 20:41:18 UTC (rev 9731)
+++ trunk/sys/boot/i386/zfsboot/zfsboot.c	2017-12-22 20:46:08 UTC (rev 9732)
@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>
-/* $FreeBSD: release/9.2.0/sys/boot/i386/zfsboot/zfsboot.c 242562 2012-11-04 13:37:33Z avg $ */
+/* $FreeBSD: stable/9/sys/boot/i386/zfsboot/zfsboot.c 300466 2016-05-23 05:30:24Z ngie $ */
 __MBSDID("$MidnightBSD$");
 
 #include <sys/param.h>
@@ -88,7 +88,6 @@
 };
 uint32_t opts;
 
-static const char *const dev_nm[NDEV] = {"ad", "da", "fd"};
 static const unsigned char dev_maj[NDEV] = {30, 4, 2};
 
 static char cmd[512];