From owner-svn-src-projects@FreeBSD.ORG  Thu Mar 17 16:35:37 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9A79F1065672;
	Thu, 17 Mar 2011 16:35:37 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8CBB98FC17;
	Thu, 17 Mar 2011 16:35:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2HGZbZB033006;
	Thu, 17 Mar 2011 16:35:37 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2HGZb64033004;
	Thu, 17 Mar 2011 16:35:37 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201103171635.p2HGZb64033004@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Thu, 17 Mar 2011 16:35:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219716 - projects/altix/sys/conf
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Mar 2011 16:35:37 -0000

Author: marcel
Date: Thu Mar 17 16:35:37 2011
New Revision: 219716
URL: http://svn.freebsd.org/changeset/base/219716

Log:
  Make it easier to switch to relocatable kernels...

Modified:
  projects/altix/sys/conf/kern.pre.mk

Modified: projects/altix/sys/conf/kern.pre.mk
==============================================================================
--- projects/altix/sys/conf/kern.pre.mk	Thu Mar 17 16:16:09 2011	(r219715)
+++ projects/altix/sys/conf/kern.pre.mk	Thu Mar 17 16:35:37 2011	(r219716)
@@ -8,6 +8,10 @@
 # backwards compat option for older systems.
 MACHINE_CPUARCH?=${MACHINE_ARCH:C/mipse[lb]/mips/:C/armeb/arm/:C/powerpc64/powerpc/}
 
+# Support for building relocatable kernels on some architectures.
+REL_KERNEL_ARCHS= # Altix TODO
+LINK_REL_KERNEL= ${REL_KERNEL_ARCHS:S/${MACHINE_ARCH}/yes/g:Myes}
+
 # Can be overridden by makeoptions or /etc/make.conf
 KERNEL_KO?=	kernel
 KERNEL?=	kernel
@@ -148,13 +152,15 @@ SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
 SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS}
 SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o}
 SYSTEM_CTFMERGE= [ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
-.if ${MACHINE_ARCH} == XXX_ALTIX_TODO
-SYSTEM_LDFLAGS= -r
+
+.if ${LINK_REL_KERNEL} == yes
+SYSTEM_LDFLAGS= -r -e __start
 .else
 SYSTEM_OBJS+= hack.So
 SYSTEM_LDFLAGS= -Bdynamic -T ${LDSCRIPT} -export-dynamic \
 	-dynamic-linker /red/herring
 .endif
+
 SYSTEM_LD= @${LD} ${SYSTEM_LDFLAGS} -warn-common \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \