From 38fed211593c14166edceb14d352da1612763f2b Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 20 Jan 2011 19:09:02 +0000
Subject: [PATCH] Collapse all the octeon ldscripts down into one now that we
 don't need one each for all the wacky ABIs

---
 ....mips.octeon1.64 => ldscript.mips.octeon1} |  3 -
 sys/conf/ldscript.mips.octeon1.32             | 60 -------------------
 sys/conf/ldscript.mips.octeon1.n32            | 60 -------------------
 3 files changed, 123 deletions(-)
 rename sys/conf/{ldscript.mips.octeon1.64 => ldscript.mips.octeon1} (86%)
 delete mode 100644 sys/conf/ldscript.mips.octeon1.32
 delete mode 100644 sys/conf/ldscript.mips.octeon1.n32

diff --git a/sys/conf/ldscript.mips.octeon1.64 b/sys/conf/ldscript.mips.octeon1
similarity index 86%
rename from sys/conf/ldscript.mips.octeon1.64
rename to sys/conf/ldscript.mips.octeon1
index ab2cef0dfea5..07b8345e90bf 100644
--- a/sys/conf/ldscript.mips.octeon1.64
+++ b/sys/conf/ldscript.mips.octeon1
@@ -1,8 +1,5 @@
 /* $FreeBSD$ */
 
-TARGET(elf64-tradbigmips)
-OUTPUT_FORMAT("elf64-tradbigmips", "elf64-tradbigmips", "elf64-tradlittlemips")
-OUTPUT_ARCH(mips)
 ENTRY(_start)
    __DYNAMIC = 0;
 PROVIDE (_DYNAMIC = 0);
diff --git a/sys/conf/ldscript.mips.octeon1.32 b/sys/conf/ldscript.mips.octeon1.32
deleted file mode 100644
index 3d1d91ce2f42..000000000000
--- a/sys/conf/ldscript.mips.octeon1.32
+++ /dev/null
@@ -1,60 +0,0 @@
-/* $FreeBSD$ */
-
-TARGET(elf32-tradbigmips)
-OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradlittlemips")
-OUTPUT_ARCH(mips)
-ENTRY(_start)
-   __DYNAMIC = 0;
-PROVIDE (_DYNAMIC = 0);
-
-SECTIONS {
-	. = KERNLOADADDR + SIZEOF_HEADERS;
-
-	.text . : {
-	    	*(.text)
-		*(.dynamic)
-		etext = .;
-		_etext = .;
-		. = ALIGN(0x2000);
-	}
-
-	.rodata ALIGN(0x2000) : {
-		_fdata = .;
-	    	*(.rodata)
-		. = ALIGN(32);
-	}
-	
-	.data . : {
-                _rwdata = .;
-	    	*(.data)
-		. = ALIGN(32);
-		CONSTRUCTORS;
-	}
-
-	_gp = (. + 0x8000);
-
-	.sdata . : {
-                _small_start = .;
-		*(.sdata)
-		. = ALIGN(32);
-		edata = .;
-		_edata = .;
-	}
-
-	.sbss . : {
-		__bss_start = .;
-		_fbss = .;
-		*(.sbss) *(.scommon)
-                _small_end = .;
-		. = ALIGN(32);
-	}
-
-	.bss . : {
-		*(.bss)
-		*(COMMON)
-		. = ALIGN(32);
-		_end = .;
-		end = .;
-	}
-
-}
diff --git a/sys/conf/ldscript.mips.octeon1.n32 b/sys/conf/ldscript.mips.octeon1.n32
deleted file mode 100644
index 62af8b9a2a4c..000000000000
--- a/sys/conf/ldscript.mips.octeon1.n32
+++ /dev/null
@@ -1,60 +0,0 @@
-/* $FreeBSD$ */
-
-TARGET(elf32-ntradbigmips)
-OUTPUT_FORMAT("elf32-ntradbigmips", "elf32-ntradbigmips", "elf32-ntradlittlemips")
-OUTPUT_ARCH(mips)
-ENTRY(_start)
-   __DYNAMIC = 0;
-PROVIDE (_DYNAMIC = 0);
-
-SECTIONS {
-	. = KERNLOADADDR + SIZEOF_HEADERS;
-
-	.text . : {
-	    	*(.text)
-		*(.dynamic)
-		etext = .;
-		_etext = .;
-		. = ALIGN(0x2000);
-	}
-
-	.rodata ALIGN(0x2000) : {
-		_fdata = .;
-	    	*(.rodata)
-		. = ALIGN(32);
-	}
-	
-	.data . : {
-                _rwdata = .;
-	    	*(.data)
-		. = ALIGN(32);
-		CONSTRUCTORS;
-	}
-
-	_gp = (. + 0x8000);
-
-	.sdata . : {
-                _small_start = .;
-		*(.sdata)
-		. = ALIGN(32);
-		edata = .;
-		_edata = .;
-	}
-
-	.sbss . : {
-		__bss_start = .;
-		_fbss = .;
-		*(.sbss) *(.scommon)
-                _small_end = .;
-		. = ALIGN(32);
-	}
-
-	.bss . : {
-		*(.bss)
-		*(COMMON)
-		. = ALIGN(32);
-		_end = .;
-		end = .;
-	}
-
-}