From owner-p4-projects@FreeBSD.ORG  Fri May  7 09:07:20 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 009A916A4D1; Fri,  7 May 2004 09:07:19 -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 CA16216A4CE
	for <perforce@freebsd.org>; Fri,  7 May 2004 09:07:19 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6A47843D45
	for <perforce@freebsd.org>; Fri,  7 May 2004 09:07:19 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i47G7JGe073457
	for <perforce@freebsd.org>; Fri, 7 May 2004 09:07:19 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i47G7ISA073454
	for perforce@freebsd.org; Fri, 7 May 2004 09:07:18 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Fri, 7 May 2004 09:07:18 -0700 (PDT)
Message-Id: <200405071607.i47G7ISA073454@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 52436 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: Fri, 07 May 2004 16:07:20 -0000

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

Change 52436 by peter@peter_daintree on 2004/05/07 09:06:49

	make the new-kld glue for amd64 only so its safer to commit

Affected files ...

.. //depot/projects/hammer/sys/conf/files#57 edit
.. //depot/projects/hammer/sys/conf/files.amd64#43 edit
.. //depot/projects/hammer/sys/conf/kmod.mk#23 edit

Differences ...

==== //depot/projects/hammer/sys/conf/files#57 (text+ko) ====

@@ -1086,7 +1086,6 @@
 kern/kern_uuid.c	standard
 kern/kern_xxx.c		standard
 kern/link_elf.c		standard
-kern/link_elf_obj.c	standard
 kern/md4c.c		optional netsmb
 kern/md5c.c		standard
 kern/sched_4bsd.c	optional sched_4bsd

==== //depot/projects/hammer/sys/conf/files.amd64#43 (text+ko) ====

@@ -129,6 +129,7 @@
 isa/psm.c			optional	psm
 isa/syscons_isa.c		optional	sc
 isa/vga_isa.c			optional	vga
+kern/link_elf_obj.c		standard
 pci/agp_ali.c			optional	agp
 pci/agp_amd.c			optional	agp
 pci/agp_i810.c			optional	agp

==== //depot/projects/hammer/sys/conf/kmod.mk#23 (text+ko) ====

@@ -137,12 +137,23 @@
 	${OBJCOPY} --strip-debug ${FULLPROG} ${PROG}
 .endif
 
+.if ${MACHINE_ARCH} != amd64
+${FULLPROG}:	${KMOD}.kld
+	${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld
+.if !defined(DEBUG_FLAGS)
+	${OBJCOPY} --strip-debug ${.TARGET}
+.endif
+
 EXPORT_SYMS?=	NO
 .if ${EXPORT_SYMS} != YES
 CLEANFILES+=	${.OBJDIR}/export_syms
 .endif
 
+.if ${MACHINE_ARCH} != amd64
+${KMOD}.kld: ${OBJS}
+.else
 ${FULLPROG}: ${OBJS}
+.endif
 	${LD} ${LDFLAGS} -r -d -o ${.TARGET} ${OBJS}
 .if defined(EXPORT_SYMS)
 .if ${EXPORT_SYMS} != YES
@@ -158,7 +169,7 @@
 	xargs -J% ${OBJCOPY} % ${.TARGET}
 .endif
 .endif
-.if !defined(DEBUG_FLAGS)
+.if !defined(DEBUG_FLAGS) && ${MACHINE_ARCH} != amd64
 	${OBJCOPY} --strip-debug ${.TARGET}
 .endif