diff options
| -rw-r--r-- | sys/arch/i386/stand/Makefile | 6 | ||||
| -rw-r--r-- | sys/arch/i386/stand/Makefile.inc | 13 | ||||
| -rw-r--r-- | sys/arch/i386/stand/biosboot/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/boot/Makefile | 5 | ||||
| -rw-r--r-- | sys/arch/i386/stand/cdboot/Makefile | 5 | ||||
| -rw-r--r-- | sys/arch/i386/stand/mbr/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/pxeboot/Makefile | 6 |
7 files changed, 28 insertions, 15 deletions
diff --git a/sys/arch/i386/stand/Makefile b/sys/arch/i386/stand/Makefile index 52d1a3c5f56..b715f07c40d 100644 --- a/sys/arch/i386/stand/Makefile +++ b/sys/arch/i386/stand/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.18 2012/10/30 11:08:27 jsing Exp $ +# $OpenBSD: Makefile,v 1.19 2013/01/18 04:10:16 jsing Exp $ .if ${MACHINE} == "i386" -SUBDIR= etc mbr cdbr +SUBDIR= mbr cdbr .endif -SUBDIR+= biosboot boot cdboot fdboot installboot pxeboot +SUBDIR+=biosboot boot cdboot fdboot installboot pxeboot test-fd0: sudo mount /dev/fd0a /mnt diff --git a/sys/arch/i386/stand/Makefile.inc b/sys/arch/i386/stand/Makefile.inc index 6de02ca088f..e1b447f0243 100644 --- a/sys/arch/i386/stand/Makefile.inc +++ b/sys/arch/i386/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.43 2012/10/30 11:08:27 jsing Exp $ +# $OpenBSD: Makefile.inc,v 1.44 2013/01/18 04:10:16 jsing Exp $ CFLAGS=${DEBUG} ${COPTS} -Os -Wall -Werror CFLAGS+= -fno-stack-protector @@ -21,7 +21,7 @@ HEAP_LIMIT=0x90000 BOOTREL=0x60000 BOOTMAGIC=0xc001d00d #ROM_SIZE=32768 -CLEANFILES+= machine +CLEANFILES+= assym.h machine .if empty(DEBUGFLAGS:M-D_TEST) SACFLAGS+=-nostdinc -fno-builtin -fpack-struct @@ -30,12 +30,11 @@ SACFLAGS+=-nostdinc -fno-builtin -fpack-struct .if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj) .BEGIN: @([ X$(S) = X -o -h machine ] || ln -s $(S)/arch/i386/include machine) -.endif -.if exists(${SADIR}/etc/assym.h) -CPPFLAGS+=-I${SADIR}/etc -.else -CPPFLAGS+=-I${SADIR}/etc/${__objdir} +assym.h: ${S}/kern/genassym.sh ${SADIR}/etc/genassym.cf + sh ${S}/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \ + ${PARAM} < ${SADIR}/etc/genassym.cf > assym.h.tmp && \ + mv -f assym.h.tmp assym.h .endif # NO_NET=no_net diff --git a/sys/arch/i386/stand/biosboot/Makefile b/sys/arch/i386/stand/biosboot/Makefile index 185e8717e9f..4cd3ff73770 100644 --- a/sys/arch/i386/stand/biosboot/Makefile +++ b/sys/arch/i386/stand/biosboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2013/01/18 03:45:23 jsing Exp $ +# $OpenBSD: Makefile,v 1.25 2013/01/18 04:10:16 jsing Exp $ MAN= biosboot.8 @@ -12,6 +12,8 @@ LD=ld LDFLAGS=-nostdlib -Ttext 0 -N -x -Bstatic -nopie INSTALL_STRIP= +${.CURDIR}/biosboot.S: assym.h + ${PROG}: $(OBJS) @rm -f $(PROG) $(LD) $(LDFLAGS) -o $(PROG) $(OBJS) diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile index 8d7c4779101..3326d71b7e3 100644 --- a/sys/arch/i386/stand/boot/Makefile +++ b/sys/arch/i386/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.47 2013/01/18 03:45:23 jsing Exp $ +# $OpenBSD: Makefile,v 1.48 2013/01/18 04:10:16 jsing Exp $ MAN?= boot.8 MLINKS?=boot.8 boot.conf.5 @@ -65,6 +65,9 @@ boot.bin: boot CLEANFILES+= ${PROG}.new +${.CURDIR}/srt0.S: assym.h +${SADIR}/libsa/gidt.S: assym.h + ${PROG}: $(OBJS) $(LD) $(LDFLAGS) -o ${PROG}.new $(OBJS) @perl ${SADIR}/boot/check-boot.pl ${PROG}.new diff --git a/sys/arch/i386/stand/cdboot/Makefile b/sys/arch/i386/stand/cdboot/Makefile index 869c228981b..4cb92db6409 100644 --- a/sys/arch/i386/stand/cdboot/Makefile +++ b/sys/arch/i386/stand/cdboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2013/01/18 03:45:23 jsing Exp $ +# $OpenBSD: Makefile,v 1.16 2013/01/18 04:10:16 jsing Exp $ MAN= cdboot.8 @@ -43,6 +43,9 @@ SRCS+= strlcpy.c .PATH: ${S}/lib/libz SRCS+= adler32.c crc32.c inflate.c inftrees.c +${.CURDIR}/srt0.S: assym.h +${SADIR}/libsa/gidt.S: assym.h + ${PROG}: $(OBJS) $(LD) $(LDFLAGS) -o ${PROG} $(OBJS) @$(SIZE) ${PROG} diff --git a/sys/arch/i386/stand/mbr/Makefile b/sys/arch/i386/stand/mbr/Makefile index 3656db02684..0882d869b5d 100644 --- a/sys/arch/i386/stand/mbr/Makefile +++ b/sys/arch/i386/stand/mbr/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2013/01/18 03:45:23 jsing Exp $ +# $OpenBSD: Makefile,v 1.18 2013/01/18 04:10:16 jsing Exp $ # S= ${.CURDIR}/../../../.. @@ -19,6 +19,8 @@ INSTALL_STRIP= # Uncomment this to make mbr talk to a serial port. #CPPFLAGS+=-DSERIAL=0 +${.CURDIR}/mbr.S: assym.h + ${PROG}: $(OBJS) $(LD) $(LDFLAGS) -o $(PROG) $(OBJS) @size $(PROG) diff --git a/sys/arch/i386/stand/pxeboot/Makefile b/sys/arch/i386/stand/pxeboot/Makefile index 5f7ad61edaa..76093848b73 100644 --- a/sys/arch/i386/stand/pxeboot/Makefile +++ b/sys/arch/i386/stand/pxeboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2013/01/18 03:45:23 jsing Exp $ +# $OpenBSD: Makefile,v 1.13 2013/01/18 04:10:16 jsing Exp $ MAN= pxeboot.8 @@ -46,6 +46,10 @@ SRCS+= strlcpy.c .PATH: ${S}/lib/libz SRCS+= adler32.c crc32.c inflate.c inftrees.c +${.CURDIR}/srt0.S: assym.h +${SADIR}/libsa/gidt.S: assym.h +${SADIR}/libsa/pxe_call.S: assym.h + ${PROG}: $(OBJS) $(LD) $(LDFLAGS) -o ${PROG} $(OBJS) @$(SIZE) ${PROG} |