diff options
| -rw-r--r-- | ld/ChangeLog | 9 | ||||
| -rw-r--r-- | ld/Makefile.am | 2 | ||||
| -rw-r--r-- | ld/Makefile.in | 2 | ||||
| -rw-r--r-- | ld/scripttempl/xstormy16.sc | 18 |
4 files changed, 20 insertions, 11 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 0c6f1e8..cfe0333 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,12 @@ +2004-09-29 Nick Clifton <nickc@redhat.com> + + * scripttempl/xstormy16.sc: Only perform the assignments to the + ROM region when not performing a relocatable link. The ROM region + does not start at address 0, but the sections will. + * Makefile.am: Fix linker script dependency for the generation of + eelf32xstormy16.c. + * Makefile.in: Regenerate. + 2004-09-18 Filip Navara <navaraf@reactos.com> * emulparams/arm_epoc_pe.sh, emulparams/armpe.sh, emulparams/i386pe.sh, diff --git a/ld/Makefile.am b/ld/Makefile.am index 22007e1..07246b9 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -600,7 +600,7 @@ eebmon29k.c: $(srcdir)/emulparams/ebmon29k.sh \ ${GENSCRIPTS} ebmon29k "$(tdir_ebmon29k)" eelf32xstormy16.c: $(srcdir)/emulparams/elf32xstormy16.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/needrelax.em \ - $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(srcdir)/scripttempl/xstormy16.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32xstormy16 "$(tdir_xstormy16)" eelf32am33lin.c: $(srcdir)/emulparams/elf32am33lin.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} diff --git a/ld/Makefile.in b/ld/Makefile.in index 3e4b1b8..ce98c5b 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -1337,7 +1337,7 @@ eebmon29k.c: $(srcdir)/emulparams/ebmon29k.sh \ ${GENSCRIPTS} ebmon29k "$(tdir_ebmon29k)" eelf32xstormy16.c: $(srcdir)/emulparams/elf32xstormy16.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/needrelax.em \ - $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(srcdir)/scripttempl/xstormy16.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32xstormy16 "$(tdir_xstormy16)" eelf32am33lin.c: $(srcdir)/emulparams/elf32am33lin.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} diff --git a/ld/scripttempl/xstormy16.sc b/ld/scripttempl/xstormy16.sc index a74df07..21c8f61 100644 --- a/ld/scripttempl/xstormy16.sc +++ b/ld/scripttempl/xstormy16.sc @@ -152,15 +152,15 @@ SECTIONS ${RELOCATING+PROVIDE (end = .);} /* Read-only sections in ROM. */ - .int_vec ${RELOCATING-0} : { *(.int_vec) } > ROM + .int_vec ${RELOCATING-0} : { *(.int_vec) } ${RELOCATING+> ROM} - .rodata ${RELOCATING-0} : { *(.rodata) ${RELOCATING+*(.rodata.*)} ${RELOCATING+*(.gnu.linkonce.r.*)} } > ROM + .rodata ${RELOCATING-0} : { *(.rodata) ${RELOCATING+*(.rodata.*)} ${RELOCATING+*(.gnu.linkonce.r.*)} } ${RELOCATING+> ROM} ${RELOCATING+${CTOR}} ${RELOCATING+${DTOR}} - .jcr : { KEEP (*(.jcr)) } > ROM - .eh_frame : { KEEP (*(.eh_frame)) } > ROM - .gcc_except_table : { *(.gcc_except_table) } > ROM - .plt : { *(.plt) } > ROM + .jcr : { KEEP (*(.jcr)) } ${RELOCATING+> ROM} + .eh_frame : { KEEP (*(.eh_frame)) } ${RELOCATING+> ROM} + .gcc_except_table : { *(.gcc_except_table) } ${RELOCATING+> ROM} + .plt : { *(.plt) } ${RELOCATING+> ROM} .text ${RELOCATING-0} : { @@ -172,19 +172,19 @@ SECTIONS *(.gnu.warning) ${RELOCATING+*(.gnu.linkonce.t.*)} ${RELOCATING+${OTHER_TEXT_SECTIONS}} - } > ROM =${NOP-0} + } ${RELOCATING+> ROM =${NOP-0}} .init ${RELOCATING-0} : { ${RELOCATING+${INIT_START}} KEEP (*(.init)) ${RELOCATING+${INIT_END}} - } > ROM =${NOP-0} + } ${RELOCATING+> ROM =${NOP-0}} .fini ${RELOCATING-0} : { ${RELOCATING+${FINI_START}} KEEP (*(.fini)) ${RELOCATING+${FINI_END}} - } > ROM =${NOP-0} + } ${RELOCATING+> ROM =${NOP-0}} ${RELOCATING+PROVIDE (__etext = .);} ${RELOCATING+PROVIDE (_etext = .);} ${RELOCATING+PROVIDE (etext = .);} |