From owner-svn-src-projects@FreeBSD.ORG  Wed Sep  9 03:59:47 2009
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 42BFF1065670;
	Wed,  9 Sep 2009 03:59:47 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 30F308FC16;
	Wed,  9 Sep 2009 03:59:47 +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 n893xlCl071873;
	Wed, 9 Sep 2009 03:59:47 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n893xlXg071871;
	Wed, 9 Sep 2009 03:59:47 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200909090359.n893xlXg071871@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 9 Sep 2009 03:59:47 +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: r197015 - projects/mips/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: Wed, 09 Sep 2009 03:59:47 -0000

Author: imp
Date: Wed Sep  9 03:59:46 2009
New Revision: 197015
URL: http://svn.freebsd.org/changeset/base/197015

Log:
  Prefer PTR_LA over a naked la to work with 64-bits..

Modified:
  projects/mips/sys/conf/Makefile.mips

Modified: projects/mips/sys/conf/Makefile.mips
==============================================================================
--- projects/mips/sys/conf/Makefile.mips	Wed Sep  9 03:57:10 2009	(r197014)
+++ projects/mips/sys/conf/Makefile.mips	Wed Sep  9 03:59:46 2009	(r197015)
@@ -90,11 +90,11 @@ ${KERNEL_KO}.tramp.bin: ${KERNEL_KO} $S/
 	# Generate .S file that setups stack and jumps to trampoline
 	echo "#include <machine/asm.h>" >tmphack.S
 	echo "ENTRY(_start)" >>tmphack.S
-	echo "la t0, kernel_end" >>tmphack.S
+	echo "PTR_LA t0, kernel_end" >>tmphack.S
 	echo "move sp, t0" >>tmphack.S
 	echo "add sp, 0x2000" >>tmphack.S
 	echo "and sp, ~0x7" >>tmphack.S
-	echo "la t0, _startC" >>tmphack.S
+	echo "PTR_LA t0, _startC" >>tmphack.S
 	echo "j t0" >>tmphack.S
 	echo "END(_start)" >>tmphack.S
 	echo "#define KERNNAME \"${KERNEL_KO}.tmp\""  >opt_kernname.h