From owner-p4-projects@FreeBSD.ORG  Tue May 27 14:55:06 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4B5CE37B404; Tue, 27 May 2003 14:55:06 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D396837B401
	for <perforce@freebsd.org>; Tue, 27 May 2003 14:55:05 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 790D443F75
	for <perforce@freebsd.org>; Tue, 27 May 2003 14:55:05 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4RLt50U052385
	for <perforce@freebsd.org>; Tue, 27 May 2003 14:55:05 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4RLt5v1052382
	for perforce@freebsd.org; Tue, 27 May 2003 14:55:05 -0700 (PDT)
Date: Tue, 27 May 2003 14:55:05 -0700 (PDT)
Message-Id: <200305272155.h4RLt5v1052382@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 31947 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 May 2003 21:55:07 -0000

http://perforce.freebsd.org/chv.cgi?CH=31947

Change 31947 by peter@peter_hammer on 2003/05/27 14:54:41

	Make this build on amd64, and from just about any subdir.

Affected files ...

.. //depot/projects/hammer/sys/boot/Makefile#6 edit
.. //depot/projects/hammer/sys/boot/common/Makefile.inc#6 edit
.. //depot/projects/hammer/sys/boot/i386/Makefile.inc#2 edit
.. //depot/projects/hammer/sys/boot/i386/boot2/Makefile#4 edit
.. //depot/projects/hammer/sys/boot/i386/btx/Makefile.inc#1 add
.. //depot/projects/hammer/sys/boot/i386/btx/btxldr/Makefile#3 edit

Differences ...

==== //depot/projects/hammer/sys/boot/Makefile#6 (text+ko) ====

@@ -1,8 +1,7 @@
 # $FreeBSD: src/sys/boot/Makefile,v 1.16 2003/04/30 22:13:36 peter Exp $
 
 .if ${MACHINE_ARCH} == "amd64"
-MACHINE_ARCH=i386
-MACHINE=i386
+.MAKEFLAGS:  MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true
 .endif
 
 .if !defined(NOFORTH)

==== //depot/projects/hammer/sys/boot/common/Makefile.inc#6 (text+ko) ====

@@ -34,7 +34,3 @@
 .endif
 
 MAN+=	loader.8
-
-.if ${MACHINE_ARCH} == "amd64"
-CFLAGS+= -m32
-.endif

==== //depot/projects/hammer/sys/boot/i386/Makefile.inc#2 (text+ko) ====

@@ -4,3 +4,14 @@
 
 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) && !defined(__been_to_Makefile_inc)
+__been_to_Makefile_inc=	1
+CFLAGS+=		-m32
+LDFLAGS+=		-m elf_i386_fbsd
+AFLAGS+=		--32
+.endif

==== //depot/projects/hammer/sys/boot/i386/boot2/Makefile#4 (text+ko) ====

@@ -109,3 +109,15 @@
 		boot2 ${DESTDIR}${BINDIR}/boot2
 
 .include <bsd.prog.mk>
+
+.if defined(REALLY_AMD64)
+boot2.o: machine
+
+beforedepend ${OBJS}: machine
+
+machine:
+	ln -sf ${.CURDIR}/../../../i386/include machine
+
+CLEANFILES+=	machine
+.endif
+

==== //depot/projects/hammer/sys/boot/i386/btx/btxldr/Makefile#3 (text+ko) ====

@@ -19,5 +19,4 @@
 
 CLEANFILES+= btxldr btxldr.out btxldr.o
 
-.include <${.CURDIR}/../../Makefile.inc>
 .include <bsd.prog.mk>