From owner-svn-src-all@FreeBSD.ORG  Mon Sep 13 16:39:34 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3381E106564A;
	Mon, 13 Sep 2010 16:39:34 +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 223288FC0C;
	Mon, 13 Sep 2010 16:39:34 +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 o8DGdYNb015259;
	Mon, 13 Sep 2010 16:39:34 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8DGdYeG015255;
	Mon, 13 Sep 2010 16:39:34 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201009131639.o8DGdYeG015255@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 13 Sep 2010 16:39:33 +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: r212560 - in head/sys: conf mips/conf
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Sep 2010 16:39:34 -0000

Author: imp
Date: Mon Sep 13 16:39:33 2010
New Revision: 212560
URL: http://svn.freebsd.org/changeset/base/212560

Log:
  TARGET_64BIT isn't needed anymore, GC it (partial merge from tbemd).

Modified:
  head/sys/conf/Makefile.mips
  head/sys/mips/conf/MALTA64
  head/sys/mips/conf/OCTEON1

Modified: head/sys/conf/Makefile.mips
==============================================================================
--- head/sys/conf/Makefile.mips	Mon Sep 13 15:36:42 2010	(r212559)
+++ head/sys/conf/Makefile.mips	Mon Sep 13 16:39:33 2010	(r212560)
@@ -54,20 +54,12 @@ SYSTEM_LD+=-EB
 EXTRA_FLAGS+=-EB 
 TRAMP_LDFLAGS+=-Wl,-EB 
 HACK_EXTRA_FLAGS+=-EB -Wl,-EB
-.if defined(TARGET_64BIT)
-SYSTEM_LD+=-m elf64btsmip_fbsd
-HACK_EXTRA_FLAGS+=-Wl,-m,elf64btsmip_fbsd
-.endif
 .else
 CFLAGS+=-EL
 SYSTEM_LD+=-EL
 EXTRA_FLAGS+=-EL
 TRAMP_LDFLAGS+=-Wl,-EL
 HACK_EXTRA_FLAGS+=-EL -Wl,-EL
-.if defined(TARGET_64BIT)
-SYSTEM_LD+=-m elf64ltsmip_fbsd
-HACK_EXTRA_FLAGS+=-Wl,-m,elf64ltsmip_fbsd
-.endif
 .endif
 
 

Modified: head/sys/mips/conf/MALTA64
==============================================================================
--- head/sys/mips/conf/MALTA64	Mon Sep 13 15:36:42 2010	(r212559)
+++ head/sys/mips/conf/MALTA64	Mon Sep 13 16:39:33 2010	(r212560)
@@ -21,7 +21,6 @@ ident		MALTA
 
 makeoptions	ARCH_FLAGS="-march=mips64 -mabi=64"
 makeoptions	MIPS_LITTLE_ENDIAN=defined
-makeoptions	TARGET_64BIT=t
 makeoptions	LDSCRIPT_NAME=	ldscript.mips.mips64
 
 options 	YAMON

Modified: head/sys/mips/conf/OCTEON1
==============================================================================
--- head/sys/mips/conf/OCTEON1	Mon Sep 13 15:36:42 2010	(r212559)
+++ head/sys/mips/conf/OCTEON1	Mon Sep 13 16:39:33 2010	(r212560)
@@ -34,7 +34,6 @@ makeoptions	LDSCRIPT_NAME=ldscript.mips.
 # Don't build any modules yet.
 makeoptions	MODULES_OVERRIDE=""
 makeoptions	TARGET_BIG_ENDIAN=defined
-makeoptions	TARGET_64BIT=defined
 makeoptions	KERNLOADADDR=0xffffffff80100000
 
 include		"../cavium/std.octeon1"