Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 Feb 2008 06:57:59 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 134635 for review
Message-ID:  <200802020657.m126vxk9072374@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802020657.m126vxk9072374>