Module Name: src Committed By: maxv Date: Mon Sep 10 17:25:21 UTC 2018
Modified Files: src/sys/arch/aarch64/conf: kern.ldscript Log Message: reduce the battlefield To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/aarch64/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/aarch64/conf/kern.ldscript diff -u src/sys/arch/aarch64/conf/kern.ldscript:1.8 src/sys/arch/aarch64/conf/kern.ldscript:1.9 --- src/sys/arch/aarch64/conf/kern.ldscript:1.8 Thu Aug 30 10:30:05 2018 +++ src/sys/arch/aarch64/conf/kern.ldscript Mon Sep 10 17:25:21 2018 @@ -10,55 +10,37 @@ SECTIONS { .text : { - PROVIDE (__kernel_text = .); - PROVIDE_HIDDEN (__eprol = .); + PROVIDE(__kernel_text = .); *(.text) - *(.text.unlikely .text.*_unlikely) - *(.text.exit .text.exit.*) - *(.text.startup .text.startup.*) - *(.text.hot .text.hot.*) - *(.stub .text.* .gnu.linkonce.t.*) - /* .gnu.warning sections are handled specially by elf32.em. */ + *(.text.*) + *(.stub) } =0 /* Move .rodata to the next L2 block to set unexecutable */ - . = ALIGN (L2_SIZE); - PROVIDE (__rodata_start = .); - .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) } - .rodata1 : { *(.rodata1) } - .eh_frame_hdr : { *(.eh_frame_hdr) } - .eh_frame : ONLY_IF_RO { KEEP (*(.eh_frame)) } - .gcc_except_table : ONLY_IF_RO { *(.gcc_except_table - .gcc_except_table.*) } - - /* These sections are generated by the Sun/Oracle C++ compiler. */ - .exception_ranges : ONLY_IF_RO { *(.exception_ranges - .exception_ranges*) } - PROVIDE (__etext = .); - PROVIDE (_etext = .); - PROVIDE (etext = .); + . = ALIGN(L2_SIZE); + + PROVIDE(__rodata_start = .); + .rodata : + { + *(.rodata) + *(.rodata.*) + } + + PROVIDE(_etext = .); + PROVIDE(etext = .); /* * Adjust the address for the data segment. Move .data to the next * L2 block, and .text and .rodata will be set readonly if needed. */ - PROVIDE (_erodata = .); - . = ALIGN (L2_SIZE); - . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE)); - /* Exception handling */ - .eh_frame : ONLY_IF_RW { KEEP (*(.eh_frame)) } - .gcc_except_table : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) } - .exception_ranges : ONLY_IF_RW { *(.exception_ranges .exception_ranges*) } - .got : { *(.got) *(.igot) } - . = DATA_SEGMENT_RELRO_END (24, .); - .got.plt : { *(.got.plt) *(.igot.plt) } - .data : + PROVIDE(_erodata = .); + . = ALIGN(L2_SIZE); + + .data : { - PROVIDE (__data_start = .); - *(.data .gnu.linkonce.d.*) - SORT(CONSTRUCTORS) + PROVIDE(__data_start = .); + *(.data) } - .data1 : { *(.data1) } . = ALIGN(64); /* COHERENCY_UNIT */ .data.cacheline_aligned : @@ -72,15 +54,15 @@ SECTIONS } . = ALIGN(64); /* COHERENCY_UNIT */ - _edata = .; PROVIDE (edata = .); - . = .; + _edata = .; + PROVIDE (edata = .); __bss_start = .; __bss_start__ = .; .bss : { - *(.dynbss) - *(.bss .bss.* .gnu.linkonce.b.*) + *(.bss) + *(.bss.*) *(COMMON) /* @@ -94,13 +76,11 @@ SECTIONS */ . = ALIGN(. != 0 ? 32 / 8 : 1); } - _bss_end__ = . ; __bss_end__ = . ; - . = ALIGN(32 / 8); + _bss_end__ = . ; + __bss_end__ = . ; . = ALIGN(32 / 8); __end__ = . ; - _end = .; PROVIDE (end = .); - . = DATA_SEGMENT_END (.); - .ARM.attributes 0 : { KEEP (*(.ARM.attributes)) KEEP (*(.gnu.attributes)) } - .note.gnu.arm.ident 0 : { KEEP (*(.note.gnu.arm.ident)) } + _end = .; + PROVIDE(end = .); }