From 5e8539294a015da472260be49f1710f28129f9e1 Mon Sep 17 00:00:00 2001 From: Christopher Roy Bratusek Date: Sat, 29 Dec 2012 09:38:41 +0100 Subject: [PATCH] Revert "updated nand-loader/rvl.ld" This reverts commit a84da88f6ad4a7357d64a93479504e671f3affc8. --- nand-loader/rvl.ld | 242 +++++++++++++++++++++++++++------------------ 1 file changed, 146 insertions(+), 96 deletions(-) diff --git a/nand-loader/rvl.ld b/nand-loader/rvl.ld index 0f1ab7e..9df04f4 100644 --- a/nand-loader/rvl.ld +++ b/nand-loader/rvl.ld @@ -4,82 +4,119 @@ OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc"); OUTPUT_ARCH(powerpc:common); -EXTERN(_start); -ENTRY(_start); - -PHDRS -{ - stub PT_LOAD FLAGS(5); - text PT_LOAD FLAGS(5); - data PT_LOAD FLAGS(6); -} +EXTERN(_stub_start); +ENTRY(_stub_start); SECTIONS { - /* stub is loaded at physical address 0x00003400 (though both 0x80003400 and 0x00003400 are equivalent for IOS) */ - /* This can also be used to load an arbitrary standalone stub at an arbitrary address in memory, for any purpose */ - /* Use -Wl,--section-start,.stub=0xADDRESS to change */ - . = 0x00003400; - - .stub : - { - KEEP(*(.stub)) - } :stub = 0 - + /* DOL header (from TITANIK's GC docs) */ /* default base address */ - /* use -Wl,--section-start,.init=0xADDRESS to change */ - . = 0x80004000; + off = 0; - /* Program */ - .init : + .header : AT(off) + { + /* 0000-001B Text[0..6] sections File Positions */ + LONG(stub_file_start); + LONG(text_file_start); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + + /* 001C-0047 Data[0..10] sections File Positions */ + LONG(data_file_start); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + + /* 0048-0063 Text[0..6] sections Mem Address */ + LONG(stub_mem_start); + LONG(text_mem_start); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + + /* 0064-008F Data[0..10] sections Mem Address */ + LONG(data_mem_start); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + + /* 0090-00AB Text[0..6] sections Sizes */ + LONG(stub_mem_size); + LONG(text_mem_size); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + + /* 00AC-00D7 Data[0..10] sections Sizes */ + LONG(data_mem_size); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + LONG(0); + + /* 00D8 BSS Mem address + 00DC BSS Size */ + LONG(bss_mem_start); + LONG(bss_mem_size); + + /* 00E0 Entry Point */ + LONG(ABSOLUTE(_stub_start)); + } + + . = 0x00003400; + off += 0x100; + + stub_mem_start = .; + stub_file_start = off; + + .stub : AT(off) + { + KEEP (*(.stub)) + . = 0x400; + } = 0 + + stub_mem_size = . - stub_mem_start; + off += stub_mem_size; + + . = 0x81330000; + + text_mem_start = .; + text_file_start = off; + + .init : AT(off) { KEEP (*crt0.o(*.init)) KEEP (*(.init)) - } :text = 0 - .plt : { *(.plt) } - .interp : { *(.interp) } - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .gnu.version : { *(.gnu.version) } - .gnu.version_d : { *(.gnu.version_d) } - .gnu.version_r : { *(.gnu.version_r) } - .rel.init : { *(.rel.init) } - .rela.init : { *(.rela.init) } - .rel.text : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) } - .rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) } - .rel.fini : { *(.rel.fini) } - .rela.fini : { *(.rela.fini) } - .rel.rodata : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) } - .rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) } - .rel.data : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) } - .rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) } - .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) } - .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) } - .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) } - .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) } - .rel.ctors : { *(.rel.ctors) } - .rela.ctors : { *(.rela.ctors) } - .rel.dtors : { *(.rel.dtors) } - .rela.dtors : { *(.rela.dtors) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rela.got1 : { *(.rela.got1) } - .rela.got2 : { *(.rela.got2) } - .rel.sdata : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) } - .rela.sdata : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) } - .rel.sbss : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) } - .rela.sbss : { *(.rela.sbss .rela.sbss.* .rel.gnu.linkonce.sb.*) } - .rel.sdata2 : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) } - .rela.sdata2 : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) } - .rel.sbss2 : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) } - .rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) } - .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) } - .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } + } - .text : + .text : { *(.text) *(.text.*) @@ -87,40 +124,40 @@ SECTIONS *(.gnu.warning) *(.gnu.linkonce.t.*) . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ - } = 0 + } - .fini : + .fini : { KEEP (*(.fini)) . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ - } = 0 - + } + PROVIDE (__etext = .); PROVIDE (_etext = .); PROVIDE (etext = .); - .rodata : { *(.rodata) *(.rodata.*) *(.gnu.linkonce.r.*) } :data - .rodata1 : { *(.rodata1) } - .sdata2 : { *(.sdata2) *(.sdata2.*) *(.gnu.linkonce.s2.*) } - .sbss2 : { *(.sbss2) *(.sbss2.*) *(.gnu.linkonce.sb2.*) } - /* Adjust the address for the data segment. We want to adjust up to - the same address within the page on the next page up. */ - /* Ensure the __preinit_array_start label is properly aligned. We - could instead move the label definition inside the section, but - the linker would then create the section even if it turns out to - be empty, which isn't pretty. */ - . = ALIGN(32 / 8); - PROVIDE (__preinit_array_start = .); - .preinit_array : { *(.preinit_array) } - PROVIDE (__preinit_array_end = .); - PROVIDE (__init_array_start = .); - .init_array : { *(.init_array) } - PROVIDE (__init_array_end = .); - PROVIDE (__fini_array_start = .); - .fini_array : { *(.fini_array) } - PROVIDE (__fini_array_end = .); - .data : + text_mem_size = . - text_mem_start; + off += text_mem_size; + + data_mem_start = .; + data_file_start = off; + + .data : AT(off) { + *(.rodata) *(.rodata.*) *(.gnu.linkonce.r.*) + *(.rodata1) + *(.sdata2) *(.sdata2.*) *(.gnu.linkonce.s2.*) + *(.sbss2) *(.sbss2.*) *(.gnu.linkonce.sb2.*) + PROVIDE (__preinit_array_start = .); + *(.preinit_array) + PROVIDE (__preinit_array_end = .); + PROVIDE (__init_array_start = .); + *(.init_array) + PROVIDE (__init_array_end = .); + PROVIDE (__fini_array_start = .); + *(.fini_array) + PROVIDE (__fini_array_end = .); + *(.data) *(.data.*) *(.gnu.linkonce.d.*) @@ -131,7 +168,6 @@ SECTIONS .data1 : { *(.data1) } .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } - .eh_frame : { KEEP (*(.eh_frame)) } .gcc_except_table : { *(.gcc_except_table) } .fixup : { *(.fixup) } .got1 : { *(.got1) } @@ -190,8 +226,14 @@ SECTIONS _edata = .; PROVIDE (edata = .); + + data_mem_size = . - data_mem_start; + off += data_mem_size; - .sbss : + bss_mem_start = .; + bss_file_start = off; + + .sbss : AT(off) { __sbss_start = .; PROVIDE (__sbss_start = .); @@ -225,6 +267,8 @@ SECTIONS PROVIDE (__bss_end = .); __bss_end = .; } + + bss_mem_size = . - bss_mem_start; _end = .; PROVIDE(end = .); @@ -270,7 +314,7 @@ __stack_end = (__bss_start + SIZEOF(.bss)); __intrstack_addr = (__stack_addr + 0x4000); __intrstack_end = (__stack_addr); __Arena1Lo = (__intrstack_addr + 31) & (-32); -__Arena1Hi = (0x817FEFF0); +__Arena1Hi = (0x816ffff0); __Arena2Lo = (0x90002000); __Arena2Hi = (0x933E0000); @@ -279,9 +323,15 @@ __ipcbufferLo = (0x933e0000); __ipcbufferHi = (0x93400000); /* for backward compatibility with old crt0 */ -PROVIDE (__stack = (0x817FEFF0)); +PROVIDE (__stack = (0x816ffff0)); PROVIDE(__isIPL = __isIPL); +PROVIDE(__text_start = text_mem_start); +PROVIDE(__text_fstart = text_file_start); +PROVIDE(__data_start = data_mem_start); +PROVIDE(__data_fstart = data_file_start); +PROVIDE(__bss_start = bss_mem_start); +PROVIDE(__bss_fstart = bss_file_start); PROVIDE(__stack_addr = __stack_addr); PROVIDE(__stack_end = __stack_end); PROVIDE(__intrstack_addr = __intrstack_addr);