svn commit: r204782 - head/sys/conf

[Juli Mallett]

Author: jmallett
Date: Fri Mar  5 23:03:20 2010
New Revision: 204782
URL: http://svn.freebsd.org/changeset/base/204782

Log:
  Harmonize Octeon ldscripts, reducing gratuitous diffs and using KERNLOADADDR in
  all of them to set the load address.
  
  Set svn:keywords.
  
  Sponsored by:	Packet Forensics

Modified:
  head/sys/conf/ldscript.mips.octeon1.32   (contents, props changed)
  head/sys/conf/ldscript.mips.octeon1.64   (contents, props changed)
  head/sys/conf/ldscript.mips.octeon1.n32   (contents, props changed)

Modified: head/sys/conf/ldscript.mips.octeon1.32
==============================================================================
--- head/sys/conf/ldscript.mips.octeon1.32	Fri Mar  5 22:59:49 2010	(r204781)
+++ head/sys/conf/ldscript.mips.octeon1.32	Fri Mar  5 23:03:20 2010	(r204782)
@@ -1,13 +1,15 @@
-/*
- *    This product includes software developed by the University of
- *    California, Berkeley and its contributors."
-*/
+/* $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)

Modified: head/sys/conf/ldscript.mips.octeon1.64
==============================================================================
--- head/sys/conf/ldscript.mips.octeon1.64	Fri Mar  5 22:59:49 2010	(r204781)
+++ head/sys/conf/ldscript.mips.octeon1.64	Fri Mar  5 23:03:20 2010	(r204782)
@@ -1,23 +1,22 @@
+/* $FreeBSD$ */
+
 TARGET(elf64-tradbigmips)
 OUTPUT_FORMAT("elf64-tradbigmips", "elf64-tradbigmips", "elf64-tradlittlemips")
 OUTPUT_ARCH(mips)
 ENTRY(_start)
-/*   __DYNAMIC = 0;
+   __DYNAMIC = 0;
 PROVIDE (_DYNAMIC = 0);
-*/
-PHDRS {
-	text	PT_LOAD FLAGS ( 5 ) ;
-}
 
 SECTIONS {
+	. = KERNLOADADDR + SIZEOF_HEADERS;
 
-	.text _start : {
+	.text . : {
 	    	*(.text)
-		/*(.dynamic)*/
+		*(.dynamic)
 		etext = .;
 		_etext = .;
 		. = ALIGN(0x2000);
-	} : text
+	}
 
 	.rodata ALIGN(0x2000) : {
 		_fdata = .;

Modified: head/sys/conf/ldscript.mips.octeon1.n32
==============================================================================
--- head/sys/conf/ldscript.mips.octeon1.n32	Fri Mar  5 22:59:49 2010	(r204781)
+++ head/sys/conf/ldscript.mips.octeon1.n32	Fri Mar  5 23:03:20 2010	(r204782)
@@ -1,3 +1,5 @@
+/* $FreeBSD$ */
+
 TARGET(elf32-ntradbigmips)
 OUTPUT_FORMAT("elf32-ntradbigmips", "elf32-ntradbigmips", "elf32-ntradlittlemips")
 OUTPUT_ARCH(mips)
@@ -6,6 +8,7 @@ ENTRY(_start)
 PROVIDE (_DYNAMIC = 0);
 
 SECTIONS {
+	. = KERNLOADADDR + SIZEOF_HEADERS;
 
 	.text . : {
 	    	*(.text)