Date: Tue, 19 Dec 2017 04:06:02 +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: r326962 - in head/stand/i386: . boot2 gptboot libfirewire libi386 loader zfsboot Message-ID: <201712190406.vBJ462Qa086972@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue Dec 19 04:06:02 2017 New Revision: 326962 URL: https://svnweb.freebsd.org/changeset/base/326962 Log: Hoist btx include stuff to i386/Makefile.inc Sponsored by: Netflix Modified: head/stand/i386/Makefile.inc head/stand/i386/boot2/Makefile head/stand/i386/gptboot/Makefile head/stand/i386/libfirewire/Makefile head/stand/i386/libi386/Makefile head/stand/i386/loader/Makefile head/stand/i386/zfsboot/Makefile Modified: head/stand/i386/Makefile.inc ============================================================================== --- head/stand/i386/Makefile.inc Tue Dec 19 04:05:55 2017 (r326961) +++ head/stand/i386/Makefile.inc Tue Dec 19 04:06:02 2017 (r326962) @@ -14,6 +14,8 @@ BTXCRT= ${BTXDIR}/lib/crt0.o BTXSRC= ${BOOTSRC}/i386/btx BTXLIB= ${BTXSRC}/lib +CFLAGS+= -I${BTXLIB} + # compact binary with no padding between text, data, bss LDSCRIPT= ${BOOTSRC}/i386/boot.ldscript # LDFLAGS_BIN=-e start -Ttext ${ORG} -Wl,-T,${LDSCRIPT},-S,--oformat,binary Modified: head/stand/i386/boot2/Makefile ============================================================================== --- head/stand/i386/boot2/Makefile Tue Dec 19 04:05:55 2017 (r326961) +++ head/stand/i386/boot2/Makefile Tue Dec 19 04:06:02 2017 (r326962) @@ -31,7 +31,6 @@ CFLAGS+=-fomit-frame-pointer \ -DSIOFMT=${B2SIOFMT} \ -DSIOSPD=${BOOT_COMCONSOLE_SPEED} \ -I${LDRSRC} \ - -I${BTXLIB} \ -Wall -Waggregate-return -Wbad-function-cast -Wno-cast-align \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ Modified: head/stand/i386/gptboot/Makefile ============================================================================== --- head/stand/i386/gptboot/Makefile Tue Dec 19 04:05:55 2017 (r326961) +++ head/stand/i386/gptboot/Makefile Tue Dec 19 04:06:02 2017 (r326962) @@ -33,7 +33,6 @@ CFLAGS+=-DBOOTPROG=\"gptboot\" \ -DSIOSPD=${BOOT_COMCONSOLE_SPEED} \ -I${LDRSRC} \ -I${BOOTSRC}/i386/common \ - -I${BTXLIB} \ -I${BOOTSRC}/i386/boot2 \ -Wall -Waggregate-return -Wbad-function-cast -Wno-cast-align \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ Modified: head/stand/i386/libfirewire/Makefile ============================================================================== --- head/stand/i386/libfirewire/Makefile Tue Dec 19 04:05:55 2017 (r326961) +++ head/stand/i386/libfirewire/Makefile Tue Dec 19 04:06:02 2017 (r326962) @@ -12,7 +12,6 @@ SRCS+= dcons.c fwcrom.c CFLAGS+= -D_BOOT CFLAGS+= -I${LDRSRC} -CFLAGS+= -I${BTXLIB} CFLAGS+= -I${BOOTSRC}/i386/libi386 CFLAGS+= -Wformat -Wall Modified: head/stand/i386/libi386/Makefile ============================================================================== --- head/stand/i386/libi386/Makefile Tue Dec 19 04:05:55 2017 (r326961) +++ head/stand/i386/libi386/Makefile Tue Dec 19 04:06:02 2017 (r326962) @@ -47,7 +47,6 @@ CFLAGS+= -Dalloca=__builtin_alloca CFLAGS+= -I${BOOTSRC}/ficl -I${BOOTSRC}/ficl/i386 \ -I${LDRSRC} -I${BOOTSRC}/i386/common \ - -I${BTXLIB} \ -I${SYSDIR}/contrib/dev/acpica/include # Handle FreeBSD specific %b and %D printf format specifiers Modified: head/stand/i386/loader/Makefile ============================================================================== --- head/stand/i386/loader/Makefile Tue Dec 19 04:05:55 2017 (r326961) +++ head/stand/i386/loader/Makefile Tue Dec 19 04:06:02 2017 (r326962) @@ -56,9 +56,6 @@ LDFLAGS+= -static -Ttext 0x0 LIBI386= ${BOOTOBJ}/i386/libi386/libi386.a CFLAGS+= -I${BOOTSRC}/i386 -# BTX components -CFLAGS+= -I${BTXLIB} - # Debug me! #CFLAGS+= -g #LDFLAGS+= -g Modified: head/stand/i386/zfsboot/Makefile ============================================================================== --- head/stand/i386/zfsboot/Makefile Tue Dec 19 04:05:55 2017 (r326961) +++ head/stand/i386/zfsboot/Makefile Tue Dec 19 04:06:02 2017 (r326962) @@ -31,7 +31,6 @@ CFLAGS+=-DBOOTPROG=\"zfsboot\" \ -I${ZFSSRC} \ -I${SYSDIR}/crypto/skein \ -I${SYSDIR}/cddl/boot/zfs \ - -I${BTXLIB} \ -I${BOOTSRC}/i386/boot2 \ -Wall -Waggregate-return -Wbad-function-cast -Wno-cast-align \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712190406.vBJ462Qa086972>