diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2004-02-07 08:10:07 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2004-02-07 08:10:07 +0000 |
| commit | 7e39a38ec9884020aee8e6166894d52d5e9f9407 (patch) | |
| tree | f23c29971d126d8aa345d6b13ad6e793732cfe47 /sys/boot/i386 | |
| parent | a54c3906adbb0fac6fedbb83ee1d41ec40dd427c (diff) | |
| download | src-7e39a38ec9884020aee8e6166894d52d5e9f9407.tar.gz src-7e39a38ec9884020aee8e6166894d52d5e9f9407.zip | |
Untangle building of AMD64 boot code.
Tested on: amd64 (sledge)
Notes
Notes:
svn path=/head/; revision=125556
Diffstat (limited to 'sys/boot/i386')
| -rw-r--r-- | sys/boot/i386/Makefile.inc | 4 | ||||
| -rw-r--r-- | sys/boot/i386/boot2/Makefile | 6 | ||||
| -rw-r--r-- | sys/boot/i386/gptboot/Makefile | 6 | ||||
| -rw-r--r-- | sys/boot/i386/libi386/Makefile | 2 | ||||
| -rw-r--r-- | sys/boot/i386/loader/Makefile | 2 |
5 files changed, 6 insertions, 14 deletions
diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc index 5bf548d5d595..6bd4f31dfb24 100644 --- a/sys/boot/i386/Makefile.inc +++ b/sys/boot/i386/Makefile.inc @@ -8,10 +8,6 @@ LOADER_ADDRESS?=0x200000 CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 .if ${MACHINE_ARCH} == "amd64" -.MAKEFLAGS: MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true -.endif - -.if defined(REALLY_AMD64) CFLAGS+= -m32 LDFLAGS+= -m elf_i386_fbsd AFLAGS+= --32 diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile index 66f13527423c..364c21f5f30e 100644 --- a/sys/boot/i386/boot2/Makefile +++ b/sys/boot/i386/boot2/Makefile @@ -93,13 +93,11 @@ boot2.h: boot1.out ORG1=`printf "%d" ${ORG1}` \ REL1=`printf "%d" ${REL1}` > ${.TARGET} -.if defined(REALLY_AMD64) +.if ${MACHINE_ARCH} == "amd64" boot2.s: machine - +CLEANFILES+= machine machine: ln -sf ${.CURDIR}/../../../i386/include machine - -CLEANFILES+= machine .endif .include <bsd.prog.mk> diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile index 66f13527423c..364c21f5f30e 100644 --- a/sys/boot/i386/gptboot/Makefile +++ b/sys/boot/i386/gptboot/Makefile @@ -93,13 +93,11 @@ boot2.h: boot1.out ORG1=`printf "%d" ${ORG1}` \ REL1=`printf "%d" ${REL1}` > ${.TARGET} -.if defined(REALLY_AMD64) +.if ${MACHINE_ARCH} == "amd64" boot2.s: machine - +CLEANFILES+= machine machine: ln -sf ${.CURDIR}/../../../i386/include machine - -CLEANFILES+= machine .endif .include <bsd.prog.mk> diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile index 2ff8f0dfd76a..253e4e57c517 100644 --- a/sys/boot/i386/libi386/Makefile +++ b/sys/boot/i386/libi386/Makefile @@ -33,7 +33,7 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ .include <bsd.lib.mk> -.if defined(REALLY_AMD64) +.if ${MACHINE_ARCH} == "amd64" ${OBJS}: machine CLEANFILES+= machine machine: diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile index 4f930f6bccec..4f5f3f26834c 100644 --- a/sys/boot/i386/loader/Makefile +++ b/sys/boot/i386/loader/Makefile @@ -96,7 +96,7 @@ loader.sym: ${OBJS} ${LIBFICL} ${LIBI386} ${LIBSTAND} ${CC} ${LDFLAGS} -o ${.TARGET} ${BTXCRT} ${OBJS} \ ${LIBFICL} ${LIBI386} ${LIBSTAND} -.if defined(REALLY_AMD64) +.if ${MACHINE_ARCH} == "amd64" ${OBJS}: machine CLEANFILES+= machine machine: |