Date: Tue, 24 Nov 2009 14:57:50 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r199751 - in projects/mips/sys: conf mips/conf Message-ID: <200911241457.nAOEvogN020173@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue Nov 24 14:57:50 2009 New Revision: 199751 URL: http://svn.freebsd.org/changeset/base/199751 Log: Get rid of redundant .kernel in these names. Added: projects/mips/sys/conf/ldscript.mips.octeon1.32 - copied unchanged from r199694, projects/mips/sys/conf/ldscript.mips.octeon1.kernel.32 projects/mips/sys/conf/ldscript.mips.octeon1.64 - copied unchanged from r199693, projects/mips/sys/conf/ldscript.mips.octeon1.kernel.64 projects/mips/sys/conf/ldscript.mips.octeon1.n32 - copied unchanged from r199693, projects/mips/sys/conf/ldscript.mips.octeon1.kernel.n32 Deleted: projects/mips/sys/conf/ldscript.mips.octeon1.kernel.32 projects/mips/sys/conf/ldscript.mips.octeon1.kernel.64 projects/mips/sys/conf/ldscript.mips.octeon1.kernel.n32 Modified: projects/mips/sys/mips/conf/OCTEON1 projects/mips/sys/mips/conf/OCTEON1-32 Copied: projects/mips/sys/conf/ldscript.mips.octeon1.32 (from r199694, projects/mips/sys/conf/ldscript.mips.octeon1.kernel.32) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/sys/conf/ldscript.mips.octeon1.32 Tue Nov 24 14:57:50 2009 (r199751, copy of r199694, projects/mips/sys/conf/ldscript.mips.octeon1.kernel.32) @@ -0,0 +1,58 @@ +/* + * This product includes software developed by the University of + * California, Berkeley and its contributors." +*/ +OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradlittlemips") +OUTPUT_ARCH(mips) +ENTRY(_start) + +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 = .; + } + +} Copied: projects/mips/sys/conf/ldscript.mips.octeon1.64 (from r199693, projects/mips/sys/conf/ldscript.mips.octeon1.kernel.64) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/sys/conf/ldscript.mips.octeon1.64 Tue Nov 24 14:57:50 2009 (r199751, copy of r199693, projects/mips/sys/conf/ldscript.mips.octeon1.kernel.64) @@ -0,0 +1,61 @@ +TARGET(elf64-tradbigmips) +OUTPUT_FORMAT("elf64-tradbigmips", "elf64-tradbigmips", "elf64-tradlittlemips") +OUTPUT_ARCH(mips) +ENTRY(_start) +/* __DYNAMIC = 0; +PROVIDE (_DYNAMIC = 0); +*/ +PHDRS { + text PT_LOAD FLAGS ( 5 ) ; +} + +SECTIONS { + + .text _start : { + *(.text) + /*(.dynamic)*/ + etext = .; + _etext = .; + . = ALIGN(0x2000); + } : text + + .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 = .; + } + +} Copied: projects/mips/sys/conf/ldscript.mips.octeon1.n32 (from r199693, projects/mips/sys/conf/ldscript.mips.octeon1.kernel.n32) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/sys/conf/ldscript.mips.octeon1.n32 Tue Nov 24 14:57:50 2009 (r199751, copy of r199693, projects/mips/sys/conf/ldscript.mips.octeon1.kernel.n32) @@ -0,0 +1,57 @@ +TARGET(elf32-ntradbigmips) +OUTPUT_FORMAT("elf32-ntradbigmips", "elf32-ntradbigmips", "elf32-ntradlittlemips") +OUTPUT_ARCH(mips) +ENTRY(_start) + __DYNAMIC = 0; +PROVIDE (_DYNAMIC = 0); + +SECTIONS { + + .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 = .; + } + +} Modified: projects/mips/sys/mips/conf/OCTEON1 ============================================================================== --- projects/mips/sys/mips/conf/OCTEON1 Tue Nov 24 14:40:50 2009 (r199750) +++ projects/mips/sys/mips/conf/OCTEON1 Tue Nov 24 14:57:50 2009 (r199751) @@ -22,14 +22,15 @@ cpu CPU_MIPS4KC ident OCTEON1 makeoptions ARCH_FLAGS="-march=mips64 -mabi=64" -makeoptions LDSCRIPT_NAME= ldscript.mips.mips64 +makeoptions LDSCRIPT_NAME=ldscript.mips.octeon.64 # Don't build any modules yet. makeoptions MODULES_OVERRIDE="" makeoptions TARGET_BIG_ENDIAN=defined makeoptions TARGET_64BIT=defined +makeoptions KERNLOADADDR=0xffffffff80100000 -options KERNVIRTADDR=0x80100000 +options KERNVIRTADDR=0xffffffff80100000 include "../octeon1/std.octeon1" hints "OCTEON1.hints" #Default places to look for devices. Modified: projects/mips/sys/mips/conf/OCTEON1-32 ============================================================================== --- projects/mips/sys/mips/conf/OCTEON1-32 Tue Nov 24 14:40:50 2009 (r199750) +++ projects/mips/sys/mips/conf/OCTEON1-32 Tue Nov 24 14:57:50 2009 (r199751) @@ -27,7 +27,7 @@ ident OCTEON1 # Don't build any modules yet. makeoptions MODULES_OVERRIDE="" makeoptions TARGET_BIG_ENDIAN=defined -makeoptions LDSCRIPT_NAME=ldscript.mips.octeon1.kernel.32 +makeoptions LDSCRIPT_NAME=ldscript.mips.octeon1.32 #makeoptions TARGET_64BIT=defined options KERNVIRTADDR=0x80100000
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911241457.nAOEvogN020173>