diff options
| author | jmallett <jmallett@FreeBSD.org> | 2010-03-05 23:03:20 +0000 |
|---|---|---|
| committer | jmallett <jmallett@FreeBSD.org> | 2010-03-05 23:03:20 +0000 |
| commit | 75e5bed028aafc6ec0ba9982fae0b164a5b34237 (patch) | |
| tree | 83ef81462b45c9ddc99098516d50b6a21ac0d5b5 | |
| parent | c941139fc2e032dc38053c18bc561d0de3df51ae (diff) | |
| download | FreeBSD-src-75e5bed028aafc6ec0ba9982fae0b164a5b34237.zip FreeBSD-src-75e5bed028aafc6ec0ba9982fae0b164a5b34237.tar.gz | |
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
| -rw-r--r-- | sys/conf/ldscript.mips.octeon1.32 | 10 | ||||
| -rw-r--r-- | sys/conf/ldscript.mips.octeon1.64 | 15 | ||||
| -rw-r--r-- | sys/conf/ldscript.mips.octeon1.n32 | 3 |
3 files changed, 16 insertions, 12 deletions
diff --git a/sys/conf/ldscript.mips.octeon1.32 b/sys/conf/ldscript.mips.octeon1.32 index d3b3c41..3d1d91c 100644 --- a/sys/conf/ldscript.mips.octeon1.32 +++ b/sys/conf/ldscript.mips.octeon1.32 @@ -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) diff --git a/sys/conf/ldscript.mips.octeon1.64 b/sys/conf/ldscript.mips.octeon1.64 index b476abf..aaef945 100644 --- a/sys/conf/ldscript.mips.octeon1.64 +++ b/sys/conf/ldscript.mips.octeon1.64 @@ -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 = .; diff --git a/sys/conf/ldscript.mips.octeon1.n32 b/sys/conf/ldscript.mips.octeon1.n32 index 4eb3224..62af8b9 100644 --- a/sys/conf/ldscript.mips.octeon1.n32 +++ b/sys/conf/ldscript.mips.octeon1.n32 @@ -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) |
