From owner-p4-projects@FreeBSD.ORG  Sat Feb  2 06:57:59 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B3CD516A41B; Sat,  2 Feb 2008 06:57:59 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4382116A417
	for <perforce@freebsd.org>; Sat,  2 Feb 2008 06:57:59 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 32A2C13C442
	for <perforce@freebsd.org>; Sat,  2 Feb 2008 06:57:59 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m126vxhC072377
	for <perforce@freebsd.org>; Sat, 2 Feb 2008 06:57:59 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m126vxk9072374
	for perforce@freebsd.org; Sat, 2 Feb 2008 06:57:59 GMT
	(envelope-from imp@freebsd.org)
Date: Sat, 2 Feb 2008 06:57:59 GMT
Message-Id: <200802020657.m126vxk9072374@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 134635 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sat, 02 Feb 2008 06:58:00 -0000

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

Change 134635 by imp@imp_lighthouse on 2008/02/02 06:57:43

	Cavium wants a different ldscript than the rest.  Cope with this
	by making it possible to have different ldscripts.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/conf/kern.pre.mk#2 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/conf/kern.pre.mk#2 (text+ko) ====

@@ -12,6 +12,8 @@
 KERNEL_KO?=	kernel
 KERNEL?=	kernel
 KODIR?=		/boot/${KERNEL}
+LDSCRIPT_NAME?=	ldscript.$M
+LDSCRIPT?=	$S/conf/${LDSCRIPT_NAME}
 
 M=	${MACHINE_ARCH}
 
@@ -134,12 +136,12 @@
 SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS}
 SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o}
 SYSTEM_OBJS+= hack.So
-SYSTEM_LD= @${LD} -Bdynamic -T $S/conf/ldscript.$M \
+SYSTEM_LD= @${LD} -Bdynamic -T ${LDSCRIPT} \
 	-warn-common -export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \
 	${SIZE} ${.TARGET} ; chmod 755 ${.TARGET}
-SYSTEM_DEP+= $S/conf/ldscript.$M
+SYSTEM_DEP+= ${LDSCRIPT}
 
 # MKMODULESENV is set here so that port makefiles can augment
 # them.