svn commit: r212560 - in head/sys: conf mips/conf

[Warner Losh]

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"