Move the definition of UFS1_ONLY into the Makefiles where it belongs.

Sponsored by: DARPA & NAI Labs.
2002-10-07 08:09:20 +00:00 · 2002-10-07 08:09:20 +00:00 · 5765b4ef72
commit 5765b4ef72
parent fcc57bdac4
4 changed files with 5 additions and 3 deletions
--- a/sys/boot/common/ufsread.c
+++ b/sys/boot/common/ufsread.c
@ -122,9 +122,6 @@ lookup(const char *path)
 	return dt == DT_REG ? ino : 0;
 }

-#ifndef __sparc64__
-#define UFS1_ONLY
-#endif
 #ifdef UFS1_ONLY

 static ssize_t
--- a/sys/boot/i386/boot2/Makefile
+++ b/sys/boot/i386/boot2/Makefile
@ -36,6 +36,8 @@ CFLAGS=	-elf -ffreestanding -Os -fno-builtin \
 	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings

+CFLAGS+= -DUFS1_ONLY 
+
 LDFLAGS=-nostdlib -static -N

 all: boot1 boot2
--- a/sys/boot/i386/gptboot/Makefile
+++ b/sys/boot/i386/gptboot/Makefile
@ -36,6 +36,8 @@ CFLAGS=	-elf -ffreestanding -Os -fno-builtin \
 	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings

+CFLAGS+= -DUFS1_ONLY 
+
 LDFLAGS=-nostdlib -static -N

 all: boot1 boot2
--- a/sys/boot/pc98/boot2/Makefile
+++ b/sys/boot/pc98/boot2/Makefile
@ -15,6 +15,7 @@ CFLAGS+=	-DBOOTSEG=${BOOTSEG} -DBOOTSTACK=${BOOTSTACK}
 CFLAGS+=	${CWARNFLAGS}
 CFLAGS+=	-I${.CURDIR}/../../.. -I.

+CFLAGS+=	-DUFS1_ONLY

 # By default, if a serial port is going to be used as console, use COM1
 # (aka /dev/ttyd0).