From owner-svn-src-projects@FreeBSD.ORG  Sat Mar 13 16:15:16 2010
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 0ABFE106566B;
	Sat, 13 Mar 2010 16:15:16 +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 EF5F18FC1B;
	Sat, 13 Mar 2010 16:15:15 +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 o2DGFFPD068892;
	Sat, 13 Mar 2010 16:15:15 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2DGFFI3068890;
	Sat, 13 Mar 2010 16:15:15 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201003131615.o2DGFFI3068890@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sat, 13 Mar 2010 16:15:15 +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: r205123 - 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: Sat, 13 Mar 2010 16:15:16 -0000

Author: marcel
Date: Sat Mar 13 16:15:15 2010
New Revision: 205123
URL: http://svn.freebsd.org/changeset/base/205123

Log:
  Build kernel modules as relocatable objects. They are much
  more easy to work with in a NUMA environment.
  
  This commit effectively breaks module support. The breakage
  is fixed when the loader and kernel know how to load and
  relocate the object files on ia64.

Modified:
  projects/altix/sys/conf/kmod.mk

Modified: projects/altix/sys/conf/kmod.mk
==============================================================================
--- projects/altix/sys/conf/kmod.mk	Sat Mar 13 15:10:07 2010	(r205122)
+++ projects/altix/sys/conf/kmod.mk	Sat Mar 13 16:15:15 2010	(r205123)
@@ -178,7 +178,8 @@ ${PROG}.symbols: ${FULLPROG}
 	${OBJCOPY} --only-keep-debug ${FULLPROG} ${.TARGET}
 .endif
 
-.if ${MACHINE_ARCH} != amd64 && ${MACHINE_ARCH} != mips
+.if ${MACHINE_ARCH} != amd64 && ${MACHINE_ARCH} != ia64 && \
+    ${MACHINE_ARCH} != mips
 ${FULLPROG}: ${KMOD}.kld
 	${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld
 .if !defined(DEBUG_FLAGS)
@@ -191,7 +192,8 @@ EXPORT_SYMS?=	NO
 CLEANFILES+=	export_syms
 .endif
 
-.if ${MACHINE_ARCH} != amd64 && ${MACHINE_ARCH} != mips
+.if ${MACHINE_ARCH} != amd64 && ${MACHINE_ARCH} != ia64 && \
+    ${MACHINE_ARCH} != mips
 ${KMOD}.kld: ${OBJS}
 .else
 ${FULLPROG}: ${OBJS}
@@ -211,7 +213,8 @@ ${FULLPROG}: ${OBJS}
 .endif
 .endif
 .if !defined(DEBUG_FLAGS) && \
-    (${MACHINE_ARCH} == amd64 || ${MACHINE_ARCH} == mips)
+    (${MACHINE_ARCH} == amd64 || ${MACHINE_ARCH} == ia64 || \
+     ${MACHINE_ARCH} == mips)
 	${OBJCOPY} --strip-debug ${.TARGET}
 .endif