diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 11 | ||||
| -rw-r--r-- | ld/Makefile.am | 8 | ||||
| -rw-r--r-- | ld/Makefile.in | 10 | ||||
| -rw-r--r-- | ld/configure.tgt | 3 | ||||
| -rw-r--r-- | ld/emulparams/i386nw.sh | 8 | ||||
| -rw-r--r-- | ld/emulparams/ppcnw.sh | 6 | ||||
| -rw-r--r-- | ld/po/BLD-POTFILES.in | 2 | ||||
| -rw-r--r-- | ld/scripttempl/nw.sc | 143 | ||||
| -rw-r--r-- | ld/testsuite/ld-powerpc/powerpc.exp | 2 |
9 files changed, 12 insertions, 181 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index d7f3e18..bb1c445 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,14 @@ +2018-04-16 Alan Modra <amodra@gmail.com> + + * Makefile.am: Remove netware support. + * configure.tgt: Likewise. + * testsuite/ld-powerpc/powerpc.exp: Likewise. + * emulparams/i386nw.sh: Delete. + * emulparams/ppcnw.sh: Delete. + * scripttempl/nw.sc: Delete. + * Makefile.in: Regenerate. + * po/BLD-POTFILES.in: Regenerate. + 2018-04-14 Alan Modra <amodra@gmail.com> * ldmain.c (main): Move config.maxpagesize and diff --git a/ld/Makefile.am b/ld/Makefile.am index aa1c69d..a919831 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -335,7 +335,6 @@ ALL_EMULATION_SOURCES = \ ei386msdos.c \ ei386nbsd.c \ ei386nto.c \ - ei386nw.c \ ei386pe.c \ ei386pe_posix.c \ em32relf.c \ @@ -377,7 +376,6 @@ ALL_EMULATION_SOURCES = \ epjlelf.c \ eppclynx.c \ eppcmacos.c \ - eppcnw.c \ eppcpe.c \ epruelf.c \ eriscix.c \ @@ -1500,9 +1498,6 @@ ei386nbsd.c: $(srcdir)/emulparams/i386nbsd.sh \ ei386nto.c: $(srcdir)/emulparams/i386nto.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} -ei386nw.c: $(srcdir)/emulparams/i386nw.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/nw.sc ${GEN_DEPENDS} - ei386pe.c: $(srcdir)/emulparams/i386pe.sh \ $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS} @@ -1696,9 +1691,6 @@ eppclynx.c: $(srcdir)/emulparams/ppclynx.sh \ eppcmacos.c: $(srcdir)/emulparams/ppcmacos.sh \ $(srcdir)/emultempl/aix.em $(srcdir)/scripttempl/aix.sc ${GEN_DEPENDS} -eppcnw.c: $(srcdir)/emulparams/ppcnw.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/nw.sc ${GEN_DEPENDS} - eppcpe.c: $(srcdir)/emulparams/ppcpe.sh \ $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/ppcpe.sc ${GEN_DEPENDS} diff --git a/ld/Makefile.in b/ld/Makefile.in index 2cd0535..3f7ced7 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -704,7 +704,6 @@ ALL_EMULATION_SOURCES = \ ei386msdos.c \ ei386nbsd.c \ ei386nto.c \ - ei386nw.c \ ei386pe.c \ ei386pe_posix.c \ em32relf.c \ @@ -746,7 +745,6 @@ ALL_EMULATION_SOURCES = \ epjlelf.c \ eppclynx.c \ eppcmacos.c \ - eppcnw.c \ eppcpe.c \ epruelf.c \ eriscix.c \ @@ -1366,7 +1364,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ei386msdos.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ei386nbsd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ei386nto.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ei386nw.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ei386pe.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ei386pe_posix.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ei386pep.Po@am__quote@ @@ -1411,7 +1408,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epjlelf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eppclynx.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eppcmacos.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eppcnw.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eppcpe.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epruelf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eriscix.Po@am__quote@ @@ -3058,9 +3054,6 @@ ei386nbsd.c: $(srcdir)/emulparams/i386nbsd.sh \ ei386nto.c: $(srcdir)/emulparams/i386nto.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} -ei386nw.c: $(srcdir)/emulparams/i386nw.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/nw.sc ${GEN_DEPENDS} - ei386pe.c: $(srcdir)/emulparams/i386pe.sh \ $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS} @@ -3254,9 +3247,6 @@ eppclynx.c: $(srcdir)/emulparams/ppclynx.sh \ eppcmacos.c: $(srcdir)/emulparams/ppcmacos.sh \ $(srcdir)/emultempl/aix.em $(srcdir)/scripttempl/aix.sc ${GEN_DEPENDS} -eppcnw.c: $(srcdir)/emulparams/ppcnw.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/nw.sc ${GEN_DEPENDS} - eppcpe.c: $(srcdir)/emulparams/ppcpe.sh \ $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/ppcpe.sc ${GEN_DEPENDS} diff --git a/ld/configure.tgt b/ld/configure.tgt index f06ae05..e4b2cb8 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -80,7 +80,6 @@ alpha*-*-linux-*) targ_emul=elf64alpha targ_extra_emuls=alpha tdir_alpha=`echo ${targ_alias} | sed -e 's/linux\(-gnu\)*/linux\1ecoff/'` ;; alpha*-*-osf*) targ_emul=alpha ;; alpha*-*-gnu*) targ_emul=elf64alpha ;; -alpha*-*-netware*) targ_emul=alpha ;; alpha*-*-netbsd*) targ_emul=elf64alpha_nbsd ;; alpha*-*-openbsd*) targ_emul=elf64alpha ;; alpha*-*-*vms*) targ_emul=alphavms @@ -328,7 +327,6 @@ x86_64-*-netbsd*) targ_emul=elf_x86_64 *) tdir_elf_i386=`echo ${tdir_elf_i386} | \ sed -e 's/netbsd/netbsdelf/'`;; esac ;; -i[3-7]86-*-netware) targ_emul=i386nw ;; i[3-7]86-*-elfiamcu) targ_emul=elf_iamcu targ_extra_emuls=elf_i386 ;; i[3-7]86-*-elf* | i[3-7]86-*-rtems*) @@ -680,7 +678,6 @@ powerpc*-*-elf* | powerpc*-*-eabi* | powerpc*-*-sysv* \ powerpc-*-nto*) targ_emul=elf32ppcnto ;; powerpcle-*-nto*) targ_emul=elf32lppcnto ;; powerpc-*-macos*) targ_emul=ppcmacos ;; -powerpc-*-netware*) targ_emul=ppcnw ;; powerpcle-*-pe | powerpcle-*-winnt* | powerpcle-*-cygwin*) targ_emul=ppcpe targ_extra_ofiles="deffilep.o pe-dll.o" ;; diff --git a/ld/emulparams/i386nw.sh b/ld/emulparams/i386nw.sh deleted file mode 100644 index e1897be..0000000 --- a/ld/emulparams/i386nw.sh +++ /dev/null @@ -1,8 +0,0 @@ -SCRIPT_NAME=nw -OUTPUT_FORMAT="elf32-i386" -TEXT_START_ADDR=0x08000000 -MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" -ARCH=i386 -NOP=0x90909090 -TEMPLATE_NAME=elf32 -GENERATE_SHLIB_SCRIPT=yes diff --git a/ld/emulparams/ppcnw.sh b/ld/emulparams/ppcnw.sh deleted file mode 100644 index e7d197d..0000000 --- a/ld/emulparams/ppcnw.sh +++ /dev/null @@ -1,6 +0,0 @@ -SCRIPT_NAME=nw -OUTPUT_FORMAT="elf32-powerpc" -TEXT_START_ADDR=0x0400000 -DATA_ADDR=0x10000000 -MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" -ARCH=powerpc diff --git a/ld/po/BLD-POTFILES.in b/ld/po/BLD-POTFILES.in index 33280c4..db4bafa 100644 --- a/ld/po/BLD-POTFILES.in +++ b/ld/po/BLD-POTFILES.in @@ -250,7 +250,6 @@ ei386moss.c ei386msdos.c ei386nbsd.c ei386nto.c -ei386nw.c ei386pe.c ei386pe_posix.c ei386pep.c @@ -295,7 +294,6 @@ epjelf.c epjlelf.c eppclynx.c eppcmacos.c -eppcnw.c eppcpe.c epruelf.c eriscix.c diff --git a/ld/scripttempl/nw.sc b/ld/scripttempl/nw.sc deleted file mode 100644 index b232fe3..0000000 --- a/ld/scripttempl/nw.sc +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright (C) 2014-2018 Free Software Foundation, Inc. -# -# Copying and distribution of this file, with or without modification, -# are permitted in any medium without royalty provided the copyright -# notice and this notice are preserved. -# -# Unusual variables checked by this code: -# NOP - four 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 .ctors .rodata ... -# (e.g., .PARISC.milli) -# OTHER_READWRITE_SECTIONS - other than .data .bss .sdata ... -# (e.g., .PARISC.global) -# 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 -# .data section. -# OTHER_BSS_SYMBOLS - symbols that appear at the start of the -# .bss section besides __bss_start. -# DATA_PLT - .plt should be in data segment, not text segment. -# -# When adding sections, do note that the names of some sections are used -# when specifying the start address of the next. -# - -test -z "${BIG_OUTPUT_FORMAT}" && BIG_OUTPUT_FORMAT=${OUTPUT_FORMAT} -test -z "${LITTLE_OUTPUT_FORMAT}" && LITTLE_OUTPUT_FORMAT=${OUTPUT_FORMAT} -test "$LD_FLAG" = "N" && DATA_ADDR=. -INTERP=".interp ${RELOCATING-0} : { *(.interp) }" -PLT=".plt ${RELOCATING-0} : { *(.plt) }" - -cat <<EOF -/* Copyright (C) 2014-2018 Free Software Foundation, Inc. - - Copying and distribution of this script, with or without modification, - are permitted in any medium without royalty provided the copyright - notice and this notice are preserved. */ - -OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}", - "${LITTLE_OUTPUT_FORMAT}") -OUTPUT_ARCH(${ARCH}) - -${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. */} -SECTIONS -{ - /* Read-only sections, merged into text segment: */ - ${CREATE_SHLIB-${RELOCATING+. = ${TEXT_START_ADDR} + SIZEOF_HEADERS;}} - ${CREATE_SHLIB+${RELOCATING+. = SIZEOF_HEADERS;}} - ${CREATE_SHLIB-${INTERP}} - .hash ${RELOCATING-0} : { *(.hash) } - .dynsym ${RELOCATING-0} : { *(.dynsym) } - .dynstr ${RELOCATING-0} : { *(.dynstr) } - .rel.text ${RELOCATING-0} : { *(.rel.text) } - .rela.text ${RELOCATING-0} : { *(.rela.text) } - .rel.data ${RELOCATING-0} : { *(.rel.data) } - .rela.data ${RELOCATING-0} : { *(.rela.data) } - .rel.rodata ${RELOCATING-0} : { *(.rel.rodata) } - .rela.rodata ${RELOCATING-0} : { *(.rela.rodata) } - .rel.got ${RELOCATING-0} : { *(.rel.got) } - .rela.got ${RELOCATING-0} : { *(.rela.got) } - .rel.ctors ${RELOCATING-0} : { *(.rel.ctors) } - .rela.ctors ${RELOCATING-0} : { *(.rela.ctors) } - .rel.dtors ${RELOCATING-0} : { *(.rel.dtors) } - .rela.dtors ${RELOCATING-0} : { *(.rela.dtors) } - .rel.bss ${RELOCATING-0} : { *(.rel.bss) } - .rela.bss ${RELOCATING-0} : { *(.rela.bss) } - .rel.plt ${RELOCATING-0} : { *(.rel.plt) } - .rela.plt ${RELOCATING-0} : { *(.rela.plt) } - .init ${RELOCATING-0} : { *(.init) } =${NOP-0} - ${DATA_PLT-${PLT}} - .text ${RELOCATING-0} : - { - ${RELOCATING+${TEXT_START_SYMBOLS}} - *(.text) - ${CONSTRUCTING+ __CTOR_LIST__ = .;} - ${CONSTRUCTING+ LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2)} - ${CONSTRUCTING+ *(.ctors)} - ${CONSTRUCTING+ LONG(0)} - ${CONSTRUCTING+ __CTOR_END__ = .;} - ${CONSTRUCTING+ __DTOR_LIST__ = .;} - ${CONSTRUCTING+ LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2)} - ${CONSTRUCTING+ *(.dtors)} - ${CONSTRUCTING+ LONG(0)} - ${CONSTRUCTING+ __DTOR_END__ = .;} - } - ${RELOCATING+_etext = .;} - ${RELOCATING+PROVIDE (etext = .);} - .fini ${RELOCATING-0} : { *(.fini) } =${NOP-0} - .ctors ${RELOCATING-0} : { *(.ctors) } - .dtors ${RELOCATING-0} : { *(.dtors) } - .rodata ${RELOCATING-0} : { *(.rodata) } - .rodata1 ${RELOCATING-0} : { *(.rodata1) } - ${OTHER_READONLY_SECTIONS} - - /* Read-write section, merged into data segment: */ - ${RELOCATING+. = ${DATA_ADDR- ALIGN(8) + ${MAXPAGESIZE}};} - .data ${RELOCATING-0} : - { - ${RELOCATING+${DATA_START_SYMBOLS}} - *(.data) - ${CONSTRUCTING+CONSTRUCTORS} - } - .data1 ${RELOCATING-0} : { *(.data1) } - ${OTHER_READWRITE_SECTIONS} - .got ${RELOCATING-0} : { *(.got.plt) *(.got) } - .dynamic ${RELOCATING-0} : { *(.dynamic) } - ${DATA_PLT+${PLT}} - /* 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) } - ${RELOCATING+_edata = .;} - ${RELOCATING+PROVIDE (edata = .);} - ${RELOCATING+__bss_start = .;} - ${RELOCATING+${OTHER_BSS_SYMBOLS}} - .sbss ${RELOCATING-0} : { *(.sbss) *(.scommon) } - .bss ${RELOCATING-0} : - { - *(.dynbss) - *(.bss) - *(COMMON) - } - ${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) } - .stabstr 0 : { *(.stabstr) } - - ${OTHER_SECTIONS} -} -EOF diff --git a/ld/testsuite/ld-powerpc/powerpc.exp b/ld/testsuite/ld-powerpc/powerpc.exp index 14c9d17..0359ba2 100644 --- a/ld/testsuite/ld-powerpc/powerpc.exp +++ b/ld/testsuite/ld-powerpc/powerpc.exp @@ -70,7 +70,7 @@ if {[istarget "*-*-vxworks"]} { # is ELF, because we pass -melf32ppc to ld and powerpc-nto-ld wants # -melf32ppcnto. -if { [istarget "*-*-macos*"] || [istarget "*-*-netware*"] +if { [istarget "*-*-macos*"] || [istarget "*-*-pe"] || [istarget "*-*-winnt*"] || [istarget "*-*-cygwin*"] || [istarget "*-*-aix*"] || [istarget "*-*-beos*"] || [istarget "*-*-lynxos*"] |