From owner-svn-src-head@FreeBSD.ORG  Thu Jan 20 19:17:05 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5D0B51065679;
	Thu, 20 Jan 2011 19:17:05 +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 4C61B8FC1C;
	Thu, 20 Jan 2011 19:17:05 +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 p0KJH51F025063;
	Thu, 20 Jan 2011 19:17:05 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0KJH51i025059;
	Thu, 20 Jan 2011 19:17:05 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201101201917.p0KJH51i025059@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 20 Jan 2011 19:17:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217653 - head/sys/mips/conf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Jan 2011 19:17:05 -0000

Author: imp
Date: Thu Jan 20 19:17:05 2011
New Revision: 217653
URL: http://svn.freebsd.org/changeset/base/217653

Log:
  Use simplified ldscripts rather than specific ones

Modified:
  head/sys/mips/conf/OCTEON1
  head/sys/mips/conf/SWARM64
  head/sys/mips/conf/SWARM64_SMP

Modified: head/sys/mips/conf/OCTEON1
==============================================================================
--- head/sys/mips/conf/OCTEON1	Thu Jan 20 19:16:29 2011	(r217652)
+++ head/sys/mips/conf/OCTEON1	Thu Jan 20 19:17:05 2011	(r217653)
@@ -21,7 +21,7 @@
 ident		OCTEON1
 
 makeoptions	ARCH_FLAGS="-march=octeon -mabi=64"
-makeoptions	LDSCRIPT_NAME=ldscript.mips.octeon1.64
+makeoptions	LDSCRIPT_NAME=ldscript.mips.octeon1
 
 # Don't build any modules yet.
 makeoptions	MODULES_OVERRIDE=""

Modified: head/sys/mips/conf/SWARM64
==============================================================================
--- head/sys/mips/conf/SWARM64	Thu Jan 20 19:16:29 2011	(r217652)
+++ head/sys/mips/conf/SWARM64	Thu Jan 20 19:17:05 2011	(r217653)
@@ -8,7 +8,7 @@ ident		SWARM64
 
 machine		mips mips64eb
 makeoptions	ARCH_FLAGS="-mabi=64 -march=mips64"
-makeoptions	LDSCRIPT_NAME=ldscript.mips.64.cfe
+makeoptions	LDSCRIPT_NAME=ldscript.mips.cfe
 makeoptions	KERNLOADADDR=0xffffffff80001000
 
 #

Modified: head/sys/mips/conf/SWARM64_SMP
==============================================================================
--- head/sys/mips/conf/SWARM64_SMP	Thu Jan 20 19:16:29 2011	(r217652)
+++ head/sys/mips/conf/SWARM64_SMP	Thu Jan 20 19:17:05 2011	(r217653)
@@ -11,7 +11,7 @@ options		PRINTF_BUFR_SIZE=128
 
 machine		mips mips64eb
 makeoptions	ARCH_FLAGS="-mabi=64 -march=mips64"
-makeoptions	LDSCRIPT_NAME=ldscript.mips.64.cfe
+makeoptions	LDSCRIPT_NAME=ldscript.mips.cfe
 makeoptions	KERNLOADADDR=0xffffffff80001000
 
 #