Module Name: src Committed By: uebayasi Date: Thu Aug 20 08:25:33 UTC 2015
Modified Files: src/sys/arch/amd64/conf: kern.ldscript Log Message: Indent. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amd64/conf/kern.ldscript Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/amd64/conf/kern.ldscript diff -u src/sys/arch/amd64/conf/kern.ldscript:1.9 src/sys/arch/amd64/conf/kern.ldscript:1.10 --- src/sys/arch/amd64/conf/kern.ldscript:1.9 Thu Aug 20 06:48:25 2015 +++ src/sys/arch/amd64/conf/kern.ldscript Thu Aug 20 08:25:33 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: kern.ldscript,v 1.9 2015/08/20 06:48:25 uebayasi Exp $ */ +/* $NetBSD: kern.ldscript,v 1.10 2015/08/20 08:25:33 uebayasi Exp $ */ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") @@ -6,60 +6,60 @@ OUTPUT_ARCH(i386:x86-64) ENTRY(_start) SECTIONS { - /* Read-only sections, merged into text segment: */ - .text : - AT (ADDR(.text) & 0x0fffffff) - { - *(.text) - *(.text.*) - *(.stub) - } =0 - _etext = . ; - PROVIDE (etext = .) ; + /* Read-only sections, merged into text segment: */ + .text : + AT (ADDR(.text) & 0x0fffffff) + { + *(.text) + *(.text.*) + *(.stub) + } =0 + _etext = . ; + PROVIDE (etext = .) ; - .rodata : - AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text))) - { - *(.rodata) - *(.rodata.*) - } + .rodata : + AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text))) + { + *(.rodata) + *(.rodata.*) + } - /* Adjust the address for the data segment. We want to adjust up to - the same address within the page on the next page up. */ - . = ALIGN(0x100000) + (. & (0x100000 - 1)); - __data_start = . ; - .data : - AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text))) - { - *(.data) - } + /* Adjust the address for the data segment. We want to adjust up to + the same address within the page on the next page up. */ + . = ALIGN(0x100000) + (. & (0x100000 - 1)); + __data_start = . ; + .data : + AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text))) + { + *(.data) + } - . = ALIGN(64); /* COHERENCY_UNIT */ - .data.cacheline_aligned : - AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text))) - { - *(.data.cacheline_aligned) - } - . = ALIGN(64); /* COHERENCY_UNIT */ - .data.read_mostly : - AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text))) - { - *(.data.read_mostly) - } - . = ALIGN(64); /* COHERENCY_UNIT */ + . = ALIGN(64); /* COHERENCY_UNIT */ + .data.cacheline_aligned : + AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text))) + { + *(.data.cacheline_aligned) + } + . = ALIGN(64); /* COHERENCY_UNIT */ + .data.read_mostly : + AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text))) + { + *(.data.read_mostly) + } + . = ALIGN(64); /* COHERENCY_UNIT */ - _edata = . ; - PROVIDE (edata = .) ; - __bss_start = . ; - .bss : - AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text))) - { - *(.bss) - *(.bss.*) - *(COMMON) - . = ALIGN(64 / 8); - } - . = ALIGN(64 / 8); + _edata = . ; + PROVIDE (edata = .) ; + __bss_start = . ; + .bss : + AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text))) + { + *(.bss) + *(.bss.*) + *(COMMON) + . = ALIGN(64 / 8); + } + . = ALIGN(64 / 8); _end = . ; PROVIDE (end = .) ; .note.netbsd.ident :