-ffreestanding is the word.

(also resort some CFLAGS such that the more "important" value are first so
they are easier to see)

5 files changed, 12 insertions, 11 deletions

diff --git a/sys/boot/alpha/boot1/Makefile b/sys/boot/alpha/boot1/Makefile
index 262f9dd..2d69202 100644
--- a/sys/boot/alpha/boot1/Makefile
+++ b/sys/boot/alpha/boot1/Makefile
@@ -8,12 +8,12 @@ PROG = boot1
 .PATH:		${.CURDIR}/../libalpha
 
 SRCS=		start.S boot1.c sys.c
-CFLAGS+=	-mno-fp-regs
+CFLAGS+=	-ffreestanding -mno-fp-regs
+CFLAGS+=	-DSECONDARY_LOAD_ADDRESS=${SECONDARY_LOAD_ADDRESS} -DMINIMAL
+CFLAGS+=	-DBOOT1
 CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}
 CFLAGS+=	-I${LIBSTANDDIR}
 CFLAGS+=	-I${.CURDIR}/..
-CFLAGS+=	-DSECONDARY_LOAD_ADDRESS=${SECONDARY_LOAD_ADDRESS} -DMINIMAL
-CFLAGS+=	-DBOOT1
 NOMAN=1
 STRIP=
 BINDIR?=	/boot
diff --git a/sys/boot/alpha/cdboot/Makefile b/sys/boot/alpha/cdboot/Makefile
index 83af791..b4f07bb 100644
--- a/sys/boot/alpha/cdboot/Makefile
+++ b/sys/boot/alpha/cdboot/Makefile
@@ -6,6 +6,6 @@ NOMAN=
 NEWVERSWHAT=	"SRM CD9660 boot" alpha
 LOAD_ADDRESS=	${PRIMARY_LOAD_ADDRESS}
 
-CFLAGS+=	-DLOADER_CDROM_SUPPORT
+CFLAGS+=	-ffreestanding -DLOADER_CDROM_SUPPORT
 
 .include <${.CURDIR}/../common/Makefile.common>
diff --git a/sys/boot/alpha/libalpha/Makefile b/sys/boot/alpha/libalpha/Makefile
index 0abacda..a3fe818 100644
--- a/sys/boot/alpha/libalpha/Makefile
+++ b/sys/boot/alpha/libalpha/Makefile
@@ -5,19 +5,20 @@ NOPIC=		true
 NOPROFILE=	true
 INTERNALLIB=	true
 
+CFLAGS+=	-ffreestanding
+#CFLAGS+=	-DDISK_DEBUG
+#CPPFLAGS+=	-DNO_DISKLABEL
+#CPPFLAGS+=	-DSAVE_MEMORY
+
 # XXX hack to pick up stand.h
 LIBSTANDDIR=	${.CURDIR}/../../../../lib/libstand
-CFLAGS+=	-I${LIBSTANDDIR}
 CFLAGS+=	-DDEBUG
+CFLAGS+=	-I${LIBSTANDDIR}
 
 # Pick up the bootstrap header for some interface items
 CFLAGS+=	-I${.CURDIR}/../../common -mno-fp-regs \
 		-I${.CURDIR}/../../.. -I.
 
-#CFLAGS+= -DDISK_DEBUG
-#CPPFLAGS+= -DNO_DISKLABEL
-#CPPFLAGS+= -DSAVE_MEMORY
-
 SRCS=	OSFpal.c elf_freebsd.c prom.c prom_disp.S prom_swpal.S \
 	pal.S reboot.c delay.c time.c alpha_module.c devicename.c \
 	srmdisk.c srmnet.c getsecs.c alpha_copy.c bootinfo.c
diff --git a/sys/boot/alpha/loader/Makefile b/sys/boot/alpha/loader/Makefile
index 177f2c4b..3b663de 100644
--- a/sys/boot/alpha/loader/Makefile
+++ b/sys/boot/alpha/loader/Makefile
@@ -7,6 +7,6 @@ INSTALL_HELP=	yes
 LOAD_ADDRESS=	${SECONDARY_LOAD_ADDRESS}
 
 # Only disk support
-CFLAGS+=	-DLOADER_DISK_SUPPORT	# -DLOADER_EXT2FS_SUPPORT
+CFLAGS+=	-ffreestanding -DLOADER_DISK_SUPPORT	# -DLOADER_EXT2FS_SUPPORT
 
 .include 	<${.CURDIR}/../common/Makefile.common>
diff --git a/sys/boot/alpha/netboot/Makefile b/sys/boot/alpha/netboot/Makefile
index 0d44c74..5599aab 100644
--- a/sys/boot/alpha/netboot/Makefile
+++ b/sys/boot/alpha/netboot/Makefile
@@ -7,7 +7,7 @@ NOMAN=
 NEWVERSWHAT=	"SRM net boot" alpha
 LOAD_ADDRESS=	${PRIMARY_LOAD_ADDRESS}
 
-CFLAGS+=	-DLOADER_NET_SUPPORT
+CFLAGS+=	-ffreestanding -DLOADER_NET_SUPPORT
 
 .include	<${.CURDIR}/../common/Makefile.common>