diff options
| -rw-r--r-- | sys/boot/common/ufsread.c | 3 | ||||
| -rw-r--r-- | sys/boot/i386/boot2/Makefile | 2 | ||||
| -rw-r--r-- | sys/boot/i386/gptboot/Makefile | 2 | ||||
| -rw-r--r-- | sys/boot/pc98/boot2/Makefile | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/sys/boot/common/ufsread.c b/sys/boot/common/ufsread.c index 3949deb..802e035 100644 --- 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 diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile index 05cf5b0..e4ab3f5 100644 --- 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 diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile index 05cf5b0..e4ab3f5 100644 --- 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 diff --git a/sys/boot/pc98/boot2/Makefile b/sys/boot/pc98/boot2/Makefile index f5f4c87..240c92c 100644 --- 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). |
