From owner-svn-src-projects@FreeBSD.ORG  Fri Mar 26 22:04:12 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 49568106566B;
	Fri, 26 Mar 2010 22:04:12 +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 3946C8FC0A;
	Fri, 26 Mar 2010 22:04:12 +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 o2QM4CLh073444;
	Fri, 26 Mar 2010 22:04:12 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2QM4C81073441;
	Fri, 26 Mar 2010 22:04:12 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201003262204.o2QM4C81073441@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Fri, 26 Mar 2010 22:04:12 +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: r205714 - 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: Fri, 26 Mar 2010 22:04:12 -0000

Author: marcel
Date: Fri Mar 26 22:04:11 2010
New Revision: 205714
URL: http://svn.freebsd.org/changeset/base/205714

Log:
  Implement a quick and dirty kluge and simply load the kernel
  at a physical address that does exist, but otherwise do not
  switch to a relocatable kernel yet.
  
  This allows the kernel to boot with the current loader and
  enables working on basic Altix support in the kernel while
  working out the NUMA aspect.

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

Modified: projects/altix/sys/conf/kern.pre.mk
==============================================================================
--- projects/altix/sys/conf/kern.pre.mk	Fri Mar 26 21:22:02 2010	(r205713)
+++ projects/altix/sys/conf/kern.pre.mk	Fri Mar 26 22:04:11 2010	(r205714)
@@ -145,12 +145,12 @@ SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o}
 SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
 LD+= -g
 .endif
-.if ${MACHINE_ARCH} != ia64
+.if ${MACHINE_ARCH} == XXX_ALTIX_TODO
+SYSTEM_LDFLAGS= -r
+.else
 SYSTEM_OBJS+= hack.So
 SYSTEM_LDFLAGS= -Bdynamic -T ${LDSCRIPT} -export-dynamic \
 	-dynamic-linker /red/herring
-.else
-SYSTEM_LDFLAGS= -r
 .endif
 SYSTEM_LD= @${LD} ${SYSTEM_LDFLAGS} -warn-common \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o

Modified: projects/altix/sys/conf/ldscript.ia64
==============================================================================
--- projects/altix/sys/conf/ldscript.ia64	Fri Mar 26 21:22:02 2010	(r205713)
+++ projects/altix/sys/conf/ldscript.ia64	Fri Mar 26 22:04:11 2010	(r205714)
@@ -3,7 +3,7 @@ OUTPUT_FORMAT("elf64-ia64-little", "elf6
 OUTPUT_ARCH(ia64)
 ENTRY(__start)
 SEARCH_DIR(/usr/lib);
-kernel_text = 0xe000000004000000;
+kernel_text = 0xe000003400000000;	/* XXX_ALTIX_TODO */
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */