diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-02-28 16:21:14 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-02-28 16:21:14 +0000 |
commit | 016a517288f59d573fd584d9a67578dade85700b (patch) | |
tree | 6cb8275aeda4341a2b5b87017159bea67e029432 | |
parent | 72be69dbccc4107e487046910654ec4f6a0f4cc3 (diff) | |
download | toolchains-016a517288f59d573fd584d9a67578dade85700b.tar.gz toolchains-016a517288f59d573fd584d9a67578dade85700b.tar.bz2 |
Remove a MorphOS patch we don't care about and was confusing git
-rw-r--r-- | ppc-amigaos/recipes/patches/binutils/0001-Changes-for-various-Amiga-targets.p | 454 |
1 files changed, 0 insertions, 454 deletions
diff --git a/ppc-amigaos/recipes/patches/binutils/0001-Changes-for-various-Amiga-targets.p b/ppc-amigaos/recipes/patches/binutils/0001-Changes-for-various-Amiga-targets.p index f86346b..bcaf3d2 100644 --- a/ppc-amigaos/recipes/patches/binutils/0001-Changes-for-various-Amiga-targets.p +++ b/ppc-amigaos/recipes/patches/binutils/0001-Changes-for-various-Amiga-targets.p @@ -26895,460 +26895,6 @@ index 3fc1352e19184c0319302e809cccf7cc861ec8d7..b8248cd4966e34e95c8b262e515ace18 + .libnix___LIB_LIST__ ${RELOCATING-0} : { *(.libnix___LIB_LIST__) } } EOF -diff --git a/ld/scripttempl/elfi370.sc b/ld/scripttempl/morphos.sc -similarity index 88% -copy from ld/scripttempl/elfi370.sc -copy to ld/scripttempl/morphos.sc -index a845b2980105fa8504b5bf8a83aeb6fc086caa6e..469a8f5f2cad237c9317faf5d23db7f2b7a63eee 100644 ---- ld/scripttempl/elfi370.sc -+++ ld/scripttempl/morphos.sc -@@ -1,17 +1,14 @@ - # --# This is just a raw copy of elfppc.sc and has not been otherwise modified --# - # Unusual variables checked by this code: --# NOP - four byte opcode for no-op (defaults to 0) -+# NOP - two byte opcode for no-op (defaults to 0) - # DATA_ADDR - if end-of-text-plus-one-page isn't right for data start - # OTHER_READONLY_SECTIONS - other than .text .init .rodata ... - # (e.g., .PARISC.milli) - # OTHER_READWRITE_SECTIONS - other than .data .bss .ctors .sdata ... - # (e.g., .PARISC.global) --# ATTRS_SECTIONS - at the end - # OTHER_SECTIONS - at the end - # EXECUTABLE_SYMBOLS - symbols that must be defined for an - # executable (e.g., _DYNAMIC_LINK) - # TEXT_START_SYMBOLS - symbols that appear at the start of the - # .text section. - # DATA_START_SYMBOLS - symbols that appear at the start of the -@@ -19,37 +16,35 @@ - # OTHER_BSS_SYMBOLS - symbols that appear at the start of the - # .bss section besides __bss_start. - # - # When adding sections, do note that the names of some sections are used - # when specifying the start address of the next. - # --test -z "$ENTRY" && ENTRY=_start - test -z "${BIG_OUTPUT_FORMAT}" && BIG_OUTPUT_FORMAT=${OUTPUT_FORMAT} - test -z "${LITTLE_OUTPUT_FORMAT}" && LITTLE_OUTPUT_FORMAT=${OUTPUT_FORMAT} --test -z "$ATTRS_SECTIONS" && ATTRS_SECTIONS=".gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }" - test "$LD_FLAG" = "N" && DATA_ADDR=. - SBSS2=".sbss2 ${RELOCATING-0} : { *(.sbss2) }" - SDATA2=".sdata2 ${RELOCATING-0} : { *(.sdata2) }" - INTERP=".interp ${RELOCATING-0} : { *(.interp) }" - PLT=".plt ${RELOCATING-0} : { *(.plt) }" - cat <<EOF - OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}", - "${LITTLE_OUTPUT_FORMAT}") - OUTPUT_ARCH(${ARCH}) --${RELOCATING+ENTRY(${ENTRY})} - - ${RELOCATING+${LIB_SEARCH_DIRS}} - ${RELOCATING+/* Do we need any of these for elf? - __DYNAMIC = 0; ${STACKZERO+${STACKZERO}} ${SHLIB_PATH+${SHLIB_PATH}} */} - ${RELOCATING+${EXECUTABLE_SYMBOLS}} - ${RELOCATING- /* For some reason, the Solaris linker makes bad executables - if gld -r is used and the intermediate file has sections starting - at non-zero addresses. Could be a Solaris ld bug, could be a GNU ld - bug. But for now assigning the zero vmas works. */} - - ${RELOCATING+PROVIDE (__stack = 0);} -+PROVIDE (__machtype = 0x1); - SECTIONS - { - /* Read-only sections, merged into text segment: */ - ${CREATE_SHLIB-${RELOCATING+. = ${TEXT_START_ADDR} + SIZEOF_HEADERS;}} - ${CREATE_SHLIB+${RELOCATING+. = SIZEOF_HEADERS;}} - ${CREATE_SHLIB-${INTERP}} -@@ -77,27 +72,30 @@ SECTIONS - .rela.sdata ${RELOCATING-0} : { *(.rela.sdata) } - .rela.sbss ${RELOCATING-0} : { *(.rela.sbss) } - .rela.sdata2 ${RELOCATING-0} : { *(.rela.sdata2) } - .rela.sbss2 ${RELOCATING-0} : { *(.rela.sbss2) } - .text ${RELOCATING-0} : - { -+ PROVIDE (__text_start = .); - ${RELOCATING+${TEXT_START_SYMBOLS}} - *(.text) - /* .gnu.warning sections are handled specially by elf32.em. */ - *(.gnu.warning) - *(.gnu.linkonce.t*) -+ PROVIDE (__text_end = .); - } =${NOP-0} -+ PROVIDE (__text_size = SIZEOF(.text)); - .init ${RELOCATING-0} : { *(.init) } =${NOP-0} - .fini ${RELOCATING-0} : { *(.fini) } =${NOP-0} - .rodata ${RELOCATING-0} : { *(.rodata) *(.gnu.linkonce.r*) } - .rodata1 ${RELOCATING-0} : { *(.rodata1) } - ${RELOCATING+_etext = .;} - ${RELOCATING+PROVIDE (etext = .);} - ${CREATE_SHLIB-${SDATA2}} - ${CREATE_SHLIB-${SBSS2}} -- ${OTHER_READONLY_SECTIONS} -+ ${RELOCATING+${OTHER_READONLY_SECTIONS}} - - /* Adjust the address for the data segment. We want to adjust up to - the same address within the page on the next page up. It would - be more correct to do this: - ${RELOCATING+. = ${DATA_ADDR-ALIGN(${MAXPAGESIZE}) + (ALIGN(8) & (${MAXPAGESIZE} - 1))};} - The current expression does not correctly handle the case of a -@@ -111,19 +109,22 @@ SECTIONS - that no actual memory is lost; the page which is skipped can not - be referenced). */ - ${RELOCATING+. = ${DATA_ADDR- ALIGN(8) + ${MAXPAGESIZE}};} - - .data ${RELOCATING-0} : - { -+ PROVIDE (__data_start = .); - ${RELOCATING+${DATA_START_SYMBOLS}} - *(.data) - *(.gnu.linkonce.d*) - ${CONSTRUCTING+CONSTRUCTORS} -+ PROVIDE (__data_end = .); - } -+ PROVIDE (__data_size = SIZEOF(.data)); - .data1 ${RELOCATING-0} : { *(.data1) } -- ${OTHER_READWRITE_SECTIONS} -+ ${RELOCATING+${OTHER_READWRITE_SECTIONS}} - - .got1 ${RELOCATING-0} : { *(.got1) } - .dynamic ${RELOCATING-0} : { *(.dynamic) } - - /* Put .ctors and .dtors next to the .got2 section, so that the pointers - get relocated with -mrelocatable. Also put in the .fixup pointers. -@@ -152,32 +153,43 @@ SECTIONS - ${CREATE_SHLIB+${SBSS2}} - ${RELOCATING+PROVIDE (_GOT_END_ = .);} - - /* We want the small data sections together, so single-instruction offsets - can access them all, and initialized data all before uninitialized, so - we can shorten the on-disk segment size. */ -- .sdata ${RELOCATING-0} : { *(.sdata) } -+ .sdata ${RELOCATING-0} : -+ { -+ PROVIDE (__sdata_start = .); -+ *(.sdata) -+ PROVIDE (__r13_init = 0x8000); -+ PROVIDE (__sdata_end = .); -+ } -+ PROVIDE (__sdata_size = SIZEOF(.sdata)); - ${RELOCATING+_edata = .;} - ${RELOCATING+PROVIDE (edata = .);} - .sbss ${RELOCATING-0} : - { -- ${RELOCATING+PROVIDE (__sbss_start = .);} -+ PROVIDE (__sbss_start = .); - *(.sbss) - *(.scommon) - *(.dynsbss) -- ${RELOCATING+PROVIDE (__sbss_end = .);} -+ PROVIDE (__sbss_end = .); - } -+ PROVIDE (__sbss_size = SIZEOF(.sbss)); - ${PLT} - .bss ${RELOCATING-0} : - { -- ${RELOCATING+${OTHER_BSS_SYMBOLS}} -- ${RELOCATING+PROVIDE (__bss_start = .);} -- *(.dynbss) -- *(.bss) -- *(COMMON) -+ PROVIDE (__bss_start = .); -+ ${RELOCATING+${OTHER_BSS_SYMBOLS}} -+ ${RELOCATING+PROVIDE (__bss_start = .);} -+ *(.dynbss) -+ *(.bss) -+ *(COMMON) -+ PROVIDE (__bss_end = .); - } -+ PROVIDE (__bss_size = SIZEOF(.bss)); - ${RELOCATING+_end = . ;} - ${RELOCATING+PROVIDE (end = .);} - - /* These are needed for ELF backends which have not yet been - converted to the new style linker. */ - .stab 0 : { *(.stab) } -@@ -197,13 +209,13 @@ SECTIONS - - /* DWARF 1.1 and DWARF 2 */ - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - - /* DWARF 2 */ -- .debug_info 0 : { *(.debug_info) *(.gnu.linkonce.wi.*) } -+ .debug_info 0 : { *(.debug_info) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } -@@ -211,17 +223,10 @@ SECTIONS - /* SGI/MIPS DWARF 2 extensions */ - .debug_weaknames 0 : { *(.debug_weaknames) } - .debug_funcnames 0 : { *(.debug_funcnames) } - .debug_typenames 0 : { *(.debug_typenames) } - .debug_varnames 0 : { *(.debug_varnames) } - -- /* DWARF 3 */ -- .debug_pubtypes 0 : { *(.debug_pubtypes) } -- .debug_ranges 0 : { *(.debug_ranges) } -- -- /* DWARF Extension. */ -- .debug_macro 0 : { *(.debug_macro) } -- -- ${ATTRS_SECTIONS} -+ /* These must appear regardless of ${RELOCATING}. */ - ${OTHER_SECTIONS} - } - EOF -diff --git a/ld/scripttempl/elfi370.sc b/ld/scripttempl/morphos_baserel.sc -similarity index 69% -copy from ld/scripttempl/elfi370.sc -copy to ld/scripttempl/morphos_baserel.sc -index a845b2980105fa8504b5bf8a83aeb6fc086caa6e..4f0f4aba86bddb4e76a9405c0da04df4c0091d9e 100644 ---- ld/scripttempl/elfi370.sc -+++ ld/scripttempl/morphos_baserel.sc -@@ -1,17 +1,14 @@ - # --# This is just a raw copy of elfppc.sc and has not been otherwise modified --# - # Unusual variables checked by this code: --# NOP - four byte opcode for no-op (defaults to 0) -+# NOP - two byte opcode for no-op (defaults to 0) - # DATA_ADDR - if end-of-text-plus-one-page isn't right for data start - # OTHER_READONLY_SECTIONS - other than .text .init .rodata ... - # (e.g., .PARISC.milli) - # OTHER_READWRITE_SECTIONS - other than .data .bss .ctors .sdata ... - # (e.g., .PARISC.global) --# ATTRS_SECTIONS - at the end - # OTHER_SECTIONS - at the end - # EXECUTABLE_SYMBOLS - symbols that must be defined for an - # executable (e.g., _DYNAMIC_LINK) - # TEXT_START_SYMBOLS - symbols that appear at the start of the - # .text section. - # DATA_START_SYMBOLS - symbols that appear at the start of the -@@ -19,37 +16,35 @@ - # OTHER_BSS_SYMBOLS - symbols that appear at the start of the - # .bss section besides __bss_start. - # - # When adding sections, do note that the names of some sections are used - # when specifying the start address of the next. - # --test -z "$ENTRY" && ENTRY=_start - test -z "${BIG_OUTPUT_FORMAT}" && BIG_OUTPUT_FORMAT=${OUTPUT_FORMAT} - test -z "${LITTLE_OUTPUT_FORMAT}" && LITTLE_OUTPUT_FORMAT=${OUTPUT_FORMAT} --test -z "$ATTRS_SECTIONS" && ATTRS_SECTIONS=".gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }" - test "$LD_FLAG" = "N" && DATA_ADDR=. - SBSS2=".sbss2 ${RELOCATING-0} : { *(.sbss2) }" - SDATA2=".sdata2 ${RELOCATING-0} : { *(.sdata2) }" - INTERP=".interp ${RELOCATING-0} : { *(.interp) }" - PLT=".plt ${RELOCATING-0} : { *(.plt) }" - cat <<EOF - OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}", - "${LITTLE_OUTPUT_FORMAT}") - OUTPUT_ARCH(${ARCH}) --${RELOCATING+ENTRY(${ENTRY})} - - ${RELOCATING+${LIB_SEARCH_DIRS}} - ${RELOCATING+/* Do we need any of these for elf? - __DYNAMIC = 0; ${STACKZERO+${STACKZERO}} ${SHLIB_PATH+${SHLIB_PATH}} */} - ${RELOCATING+${EXECUTABLE_SYMBOLS}} - ${RELOCATING- /* For some reason, the Solaris linker makes bad executables - if gld -r is used and the intermediate file has sections starting - at non-zero addresses. Could be a Solaris ld bug, could be a GNU ld - bug. But for now assigning the zero vmas works. */} - - ${RELOCATING+PROVIDE (__stack = 0);} -+PROVIDE (__machtype = 0x1); - SECTIONS - { - /* Read-only sections, merged into text segment: */ - ${CREATE_SHLIB-${RELOCATING+. = ${TEXT_START_ADDR} + SIZEOF_HEADERS;}} - ${CREATE_SHLIB+${RELOCATING+. = SIZEOF_HEADERS;}} - ${CREATE_SHLIB-${INTERP}} -@@ -58,72 +53,53 @@ SECTIONS - .dynstr ${RELOCATING-0} : { *(.dynstr) } - .gnu.version ${RELOCATING-0} : { *(.gnu.version) } - .gnu.version_d ${RELOCATING-0} : { *(.gnu.version_d) } - .gnu.version_r ${RELOCATING-0} : { *(.gnu.version_r) } - .rela.text ${RELOCATING-0} : - { *(.rela.text) *(.rela.gnu.linkonce.t*) } -- .rela.data ${RELOCATING-0} : -- { *(.rela.data) *(.rela.gnu.linkonce.d*) } -- .rela.rodata ${RELOCATING-0} : -- { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } - .rela.got ${RELOCATING-0} : { *(.rela.got) } - .rela.got1 ${RELOCATING-0} : { *(.rela.got1) } - .rela.got2 ${RELOCATING-0} : { *(.rela.got2) } - .rela.ctors ${RELOCATING-0} : { *(.rela.ctors) } - .rela.dtors ${RELOCATING-0} : { *(.rela.dtors) } - .rela.init ${RELOCATING-0} : { *(.rela.init) } - .rela.fini ${RELOCATING-0} : { *(.rela.fini) } -- .rela.bss ${RELOCATING-0} : { *(.rela.bss) } - .rela.plt ${RELOCATING-0} : { *(.rela.plt) } -- .rela.sdata ${RELOCATING-0} : { *(.rela.sdata) } -- .rela.sbss ${RELOCATING-0} : { *(.rela.sbss) } -+ .rela.rodata ${RELOCATING-0} : -+ { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } -+ .rela.sdata ${RELOCATING-0} : -+ { -+ *(.rela.data) -+ *(.rela.gnu.linkonce.d*) -+ *(.rela.sdata) -+ } -+ .rela.sbss ${RELOCATING-0} : -+ { -+ *(.rela.sbss) -+ *(.rela.bss) -+ } - .rela.sdata2 ${RELOCATING-0} : { *(.rela.sdata2) } - .rela.sbss2 ${RELOCATING-0} : { *(.rela.sbss2) } - .text ${RELOCATING-0} : - { -+ PROVIDE (__text_start = .); - ${RELOCATING+${TEXT_START_SYMBOLS}} - *(.text) - /* .gnu.warning sections are handled specially by elf32.em. */ - *(.gnu.warning) - *(.gnu.linkonce.t*) -+ PROVIDE (__text_end = .); - } =${NOP-0} -+ PROVIDE (__text_size = SIZEOF(.text)); - .init ${RELOCATING-0} : { *(.init) } =${NOP-0} - .fini ${RELOCATING-0} : { *(.fini) } =${NOP-0} -- .rodata ${RELOCATING-0} : { *(.rodata) *(.gnu.linkonce.r*) } -- .rodata1 ${RELOCATING-0} : { *(.rodata1) } - ${RELOCATING+_etext = .;} - ${RELOCATING+PROVIDE (etext = .);} - ${CREATE_SHLIB-${SDATA2}} - ${CREATE_SHLIB-${SBSS2}} -- ${OTHER_READONLY_SECTIONS} -- -- /* Adjust the address for the data segment. We want to adjust up to -- the same address within the page on the next page up. It would -- be more correct to do this: -- ${RELOCATING+. = ${DATA_ADDR-ALIGN(${MAXPAGESIZE}) + (ALIGN(8) & (${MAXPAGESIZE} - 1))};} -- The current expression does not correctly handle the case of a -- text segment ending precisely at the end of a page; it causes the -- data segment to skip a page. The above expression does not have -- this problem, but it will currently (2/95) cause BFD to allocate -- a single segment, combining both text and data, for this case. -- This will prevent the text segment from being shared among -- multiple executions of the program; I think that is more -- important than losing a page of the virtual address space (note -- that no actual memory is lost; the page which is skipped can not -- be referenced). */ -- ${RELOCATING+. = ${DATA_ADDR- ALIGN(8) + ${MAXPAGESIZE}};} -- -- .data ${RELOCATING-0} : -- { -- ${RELOCATING+${DATA_START_SYMBOLS}} -- *(.data) -- *(.gnu.linkonce.d*) -- ${CONSTRUCTING+CONSTRUCTORS} -- } -- .data1 ${RELOCATING-0} : { *(.data1) } -- ${OTHER_READWRITE_SECTIONS} -+ ${RELOCATING+${OTHER_READONLY_SECTIONS}} - - .got1 ${RELOCATING-0} : { *(.got1) } - .dynamic ${RELOCATING-0} : { *(.dynamic) } - - /* Put .ctors and .dtors next to the .got2 section, so that the pointers - get relocated with -mrelocatable. Also put in the .fixup pointers. -@@ -148,38 +124,41 @@ SECTIONS - ${RELOCATING+PROVIDE (_GOT_START_ = .);} - .got ${RELOCATING-0} : { *(.got) } - .got.plt ${RELOCATING-0} : { *(.got.plt) } - ${CREATE_SHLIB+${SDATA2}} - ${CREATE_SHLIB+${SBSS2}} - ${RELOCATING+PROVIDE (_GOT_END_ = .);} -- -- /* We want the small data sections together, so single-instruction offsets -+ .rodata ${RELOCATING-0} : { *(.rodata) } -+ /* We want the small data sections together, so single-instruction offsets - can access them all, and initialized data all before uninitialized, so - we can shorten the on-disk segment size. */ -- .sdata ${RELOCATING-0} : { *(.sdata) } -+ .sdata ${RELOCATING-0} : -+ { -+ /*PROVIDE (__sdata_start = .);*/ -+ __sdata_start = .; -+ *(.data) -+ *(.data1) -+ __small_start = .; -+ *(.sdata) -+ PROVIDE (__r13_init = /*__small_start*/ __sdata_start + 0x8000); -+ PROVIDE (__sdata_end = .); -+ } -+ PROVIDE (__sdata_size = SIZEOF(.sdata)); - ${RELOCATING+_edata = .;} - ${RELOCATING+PROVIDE (edata = .);} - .sbss ${RELOCATING-0} : - { -- ${RELOCATING+PROVIDE (__sbss_start = .);} -+ PROVIDE (__sbss_start = .); - *(.sbss) - *(.scommon) - *(.dynsbss) -- ${RELOCATING+PROVIDE (__sbss_end = .);} -- } -- ${PLT} -- .bss ${RELOCATING-0} : -- { -- ${RELOCATING+${OTHER_BSS_SYMBOLS}} -- ${RELOCATING+PROVIDE (__bss_start = .);} -- *(.dynbss) -- *(.bss) -- *(COMMON) -+ *(.bss) -+ *(COMMON) -+ PROVIDE (__sbss_end = .); - } -- ${RELOCATING+_end = . ;} -- ${RELOCATING+PROVIDE (end = .);} -+ PROVIDE (__sbss_size = SIZEOF(.sbss)); - - /* These are needed for ELF backends which have not yet been - converted to the new style linker. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - -@@ -197,13 +176,13 @@ SECTIONS - - /* DWARF 1.1 and DWARF 2 */ - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - - /* DWARF 2 */ -- .debug_info 0 : { *(.debug_info) *(.gnu.linkonce.wi.*) } -+ .debug_info 0 : { *(.debug_info) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } -@@ -211,17 +190,10 @@ SECTIONS - /* SGI/MIPS DWARF 2 extensions */ - .debug_weaknames 0 : { *(.debug_weaknames) } - .debug_funcnames 0 : { *(.debug_funcnames) } - .debug_typenames 0 : { *(.debug_typenames) } - .debug_varnames 0 : { *(.debug_varnames) } - -- /* DWARF 3 */ -- .debug_pubtypes 0 : { *(.debug_pubtypes) } -- .debug_ranges 0 : { *(.debug_ranges) } -- -- /* DWARF Extension. */ -- .debug_macro 0 : { *(.debug_macro) } -- -- ${ATTRS_SECTIONS} -+ /* These must appear regardless of ${RELOCATING}. */ - ${OTHER_SECTIONS} - } - EOF diff --git a/libiberty/config/mh-amigaos b/libiberty/config/mh-amigaos new file mode 100644 index 0000000000000000000000000000000000000000..495fa7e35897000efe600c9f1dd844b086731fcd |