Hoist btx include stuff to i386/Makefile.inc
Sponsored by: Netflix
This commit is contained in:
parent
6bc860372d
commit
ca481bffc2
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=326962
@ -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
|
||||
|
@ -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 \
|
||||
|
@ -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 \
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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 \
|
||||
|
Loading…
Reference in New Issue
Block a user