svn commit: r213227 - head/sys/conf

[Juli Mallett]

Author: jmallett
Date: Mon Sep 27 19:45:34 2010
New Revision: 213227
URL: http://svn.freebsd.org/changeset/base/213227

Log:
  Use a single program header to fix loading 64-bit kernels on old versions of
  U-Boot.

Modified:
  head/sys/conf/ldscript.mips.octeon1.64

Modified: head/sys/conf/ldscript.mips.octeon1.64
==============================================================================
--- head/sys/conf/ldscript.mips.octeon1.64	Mon Sep 27 19:36:15 2010	(r213226)
+++ head/sys/conf/ldscript.mips.octeon1.64	Mon Sep 27 19:45:34 2010	(r213227)
@@ -7,24 +7,29 @@ ENTRY(_start)
    __DYNAMIC = 0;
 PROVIDE (_DYNAMIC = 0);
 
+PHDRS {
+	text PT_LOAD FLAGS(0x7);
+}
+
 SECTIONS {
 	. = KERNLOADADDR + SIZEOF_HEADERS;
 
-	.text . : {
+	.text : {
 	    	*(.text)
 		*(.dynamic)
 		etext = .;
 		_etext = .;
 		. = ALIGN(0x2000);
-	}
+	} : text
 
-	.rodata ALIGN(0x2000) : {
+	. = ALIGN(0x2000);
+	.rodata : {
 		_fdata = .;
 	    	*(.rodata)
 		. = ALIGN(32);
 	}
 	
-	.data . : {
+	.data : {
                 _rwdata = .;
 	    	*(.data)
 		. = ALIGN(32);
@@ -33,15 +38,15 @@ SECTIONS {
 
 	_gp = (. + 0x8000);
 
-	.sdata . : {
+	.sdata : {
                 _small_start = .;
 		*(.sdata)
 		. = ALIGN(32);
 		edata = .;
 		_edata = .;
-	}
+	} : text
 
-	.sbss . : {
+	.sbss : {
 		__bss_start = .;
 		_fbss = .;
 		*(.sbss) *(.scommon)
@@ -49,7 +54,7 @@ SECTIONS {
 		. = ALIGN(32);
 	}
 
-	.bss . : {
+	.bss : {
 		*(.bss)
 		*(COMMON)
 		. = ALIGN(32);