- Removed -elf which is not a valid gcc(1) option anymore.

- Removed -ffreestanding; it's enforced by ../Makefile.inc.

5 files changed, 3 insertions, 9 deletions

diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
index 830ef15f6a9e..f1585daa0940 100644
--- a/sys/boot/i386/boot2/Makefile
+++ b/sys/boot/i386/boot2/Makefile
@@ -25,7 +25,7 @@ AFLAGS+=--defsym FLAGS=${B1FLAGS} \
 	--defsym SIOFMT=${B2SIOFMT} \
 	--defsym SIOSPD=${BOOT_COMCONSOLE_SPEED}
 
-CFLAGS=	-elf -ffreestanding -Os -fno-builtin \
+CFLAGS=	-Os \
 	-fno-guess-branch-probability -fomit-frame-pointer\
 	-mno-align-long-strings \
 	-mrtd \
diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile
index 830ef15f6a9e..f1585daa0940 100644
--- a/sys/boot/i386/gptboot/Makefile
+++ b/sys/boot/i386/gptboot/Makefile
@@ -25,7 +25,7 @@ AFLAGS+=--defsym FLAGS=${B1FLAGS} \
 	--defsym SIOFMT=${B2SIOFMT} \
 	--defsym SIOSPD=${BOOT_COMCONSOLE_SPEED}
 
-CFLAGS=	-elf -ffreestanding -Os -fno-builtin \
+CFLAGS=	-Os \
 	-fno-guess-branch-probability -fomit-frame-pointer\
 	-mno-align-long-strings \
 	-mrtd \
diff --git a/sys/boot/i386/kgzldr/Makefile b/sys/boot/i386/kgzldr/Makefile
index b89d75de5ab6..4f21e8a353a9 100644
--- a/sys/boot/i386/kgzldr/Makefile
+++ b/sys/boot/i386/kgzldr/Makefile
@@ -9,8 +9,7 @@ CLEANFILES= kgzldr.o
 
 SRCS=	start.s boot.c inflate.c lib.c crt.s sio.s
 OBJS=	${SRCS:N*.h:R:S/$/.o/g}
-CFLAGS=	-ffreestanding
-CFLAGS+=-Os
+CFLAGS=	-Os
 CFLAGS+=-DKZIP
 LDFLAGS=-nostdlib -static -Wl,-r
 .PATH:	${.CURDIR}/../../../kern
diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
index 253e4e57c517..c785dc760c1d 100644
--- a/sys/boot/i386/libi386/Makefile
+++ b/sys/boot/i386/libi386/Makefile
@@ -10,7 +10,6 @@ SRCS=	biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \
 	i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \
 	time.c vidconsole.c amd64_tramp.S
 
-CFLAGS+=	-ffreestanding
 BOOT_COMCONSOLE_PORT?= 0x3f8
 CFLAGS+=	-DCOMPORT=${BOOT_COMCONSOLE_PORT}
 
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index 4f5f3f26834c..27cbf5b71e97 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -5,7 +5,6 @@ NEWVERSWHAT=	"bootstrap loader" i386
 # architecture-specific loader code
 SRCS=		main.c conf.c vers.c
 
-CFLAGS+=	-ffreestanding
 # Enable PXE TFTP or NFS support, not both.
 .if defined(LOADER_TFTP_SUPPORT)
 CFLAGS+=	-DLOADER_TFTP_SUPPORT
@@ -53,9 +52,6 @@ CFLAGS+=	-I${.CURDIR}/..
 # BTX components
 CFLAGS+=	-I${.CURDIR}/../btx/lib
 
-# BTX is expecting ELF components
-CFLAGS+=	-elf
-
 # Debug me!
 #CFLAGS+=	-g
 #LDFLAGS+=	-g