From owner-svn-src-user@FreeBSD.ORG Tue Mar 9 22:34:27 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E8BA81065672; Tue, 9 Mar 2010 22:34:26 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D77CA8FC18; Tue, 9 Mar 2010 22:34:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o29MYQAM049648; Tue, 9 Mar 2010 22:34:26 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o29MYQK9049643; Tue, 9 Mar 2010 22:34:26 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003092234.o29MYQK9049643@svn.freebsd.org> From: Juli Mallett Date: Tue, 9 Mar 2010 22:34:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204932 - in user/jmallett/octeon/sys: conf mips/conf X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Mar 2010 22:34:27 -0000 Author: jmallett Date: Tue Mar 9 22:34:26 2010 New Revision: 204932 URL: http://svn.freebsd.org/changeset/base/204932 Log: Merge all the Octeon ldscripts. There are better ways to override the output binary format than doing it in the ldscript, and with TARGET_ABI we have the right default now anyway. Now, modulo checking uses of ISA_MIPS32 vs. ISA_MIPS64 here, the n32 and o32 kernel configurations are identical but for sorting and style issues. Added: user/jmallett/octeon/sys/conf/ldscript.mips.octeon1 Deleted: user/jmallett/octeon/sys/conf/ldscript.mips.octeon1.32 user/jmallett/octeon/sys/conf/ldscript.mips.octeon1.64 user/jmallett/octeon/sys/conf/ldscript.mips.octeon1.n32 Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1 user/jmallett/octeon/sys/mips/conf/OCTEON1-32 user/jmallett/octeon/sys/mips/conf/OCTEON1-o32 Added: user/jmallett/octeon/sys/conf/ldscript.mips.octeon1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/jmallett/octeon/sys/conf/ldscript.mips.octeon1 Tue Mar 9 22:34:26 2010 (r204932) @@ -0,0 +1,58 @@ +/* $FreeBSD: user/jmallett/octeon/sys/conf/ldscript.mips.octeon1.32 204784 2010-03-05 23:14:01Z jmallett $ */ + +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 = .; + } + +} Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1 ============================================================================== --- user/jmallett/octeon/sys/mips/conf/OCTEON1 Tue Mar 9 22:10:11 2010 (r204931) +++ user/jmallett/octeon/sys/mips/conf/OCTEON1 Tue Mar 9 22:34:26 2010 (r204932) @@ -29,7 +29,7 @@ cpu CPU_MIPS4KC ident OCTEON1 makeoptions ARCH_FLAGS="-march=mips64" -makeoptions LDSCRIPT_NAME=ldscript.mips.octeon1.64 +makeoptions LDSCRIPT_NAME=ldscript.mips.octeon1 # Don't build any modules yet. makeoptions MODULES_OVERRIDE="" Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1-32 ============================================================================== --- user/jmallett/octeon/sys/mips/conf/OCTEON1-32 Tue Mar 9 22:10:11 2010 (r204931) +++ user/jmallett/octeon/sys/mips/conf/OCTEON1-32 Tue Mar 9 22:34:26 2010 (r204932) @@ -24,7 +24,7 @@ ident OCTEON1 # Don't build any modules yet. makeoptions MODULES_OVERRIDE="" makeoptions ARCH_FLAGS="-march=mips64" -makeoptions LDSCRIPT_NAME=ldscript.mips.octeon1.n32 +makeoptions LDSCRIPT_NAME=ldscript.mips.octeon1 makeoptions KERNLOADADDR=0xffffffff81000000 Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1-o32 ============================================================================== --- user/jmallett/octeon/sys/mips/conf/OCTEON1-o32 Tue Mar 9 22:10:11 2010 (r204931) +++ user/jmallett/octeon/sys/mips/conf/OCTEON1-o32 Tue Mar 9 22:34:26 2010 (r204932) @@ -24,7 +24,7 @@ ident OCTEON1 # Don't build any modules yet. makeoptions MODULES_OVERRIDE="" makeoptions ARCH_FLAGS="-march=mips64" -makeoptions LDSCRIPT_NAME=ldscript.mips.octeon1.32 +makeoptions LDSCRIPT_NAME=ldscript.mips.octeon1 makeoptions KERNLOADADDR=0xffffffff81000000