diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 8 | ||||
| -rw-r--r-- | ld/Makefile.am | 4 | ||||
| -rw-r--r-- | ld/Makefile.in | 5 | ||||
| -rw-r--r-- | ld/configure.tgt | 1 | ||||
| -rw-r--r-- | ld/emulparams/elf_i386_chaos.sh | 15 |
5 files changed, 8 insertions, 25 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 0e583a4..2ac6cdd 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,13 @@ 2019-04-08 H.J. Lu <hongjiu.lu@intel.com> + * Makefile.am (ALL_EMULATION_SOURCES): Remove eelf_i386_chaos.c. + (eelf_i386_chaos.c): Removed. + * Makefile.in: Regenerated. + * configure.tgt: Remove i[3-7]86-*-kaos*. + * emulparams/elf_i386_chaos.sh: Removed. + +2019-04-08 H.J. Lu <hongjiu.lu@intel.com> + * emulparams/elf_i386_be.sh (EXTRA_EM_FILE): New. * emulparams/i386moss.sh (EXTRA_EM_FILE): Likewise. diff --git a/ld/Makefile.am b/ld/Makefile.am index 6d750c8..199bacf 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -284,7 +284,6 @@ ALL_EMULATION_SOURCES = \ eelf32xtensa.c \ eelf_i386.c \ eelf_i386_be.c \ - eelf_i386_chaos.c \ eelf_i386_fbsd.c \ eelf_i386_ldso.c \ eelf_i386_nacl.c \ @@ -1293,9 +1292,6 @@ eelf_i386.c: $(srcdir)/emulparams/elf_i386.sh \ eelf_i386_be.c: $(srcdir)/emulparams/elf_i386_be.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} -eelf_i386_chaos.c: $(srcdir)/emulparams/elf_i386_chaos.sh \ - $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf_chaos.sc ${GEN_DEPENDS} - eelf_i386_fbsd.c: $(srcdir)/emulparams/elf_i386_fbsd.sh \ $(srcdir)/emulparams/elf_i386.sh \ $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} diff --git a/ld/Makefile.in b/ld/Makefile.in index 0f3c11a..edaf530 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -770,7 +770,6 @@ ALL_EMULATION_SOURCES = \ eelf32xtensa.c \ eelf_i386.c \ eelf_i386_be.c \ - eelf_i386_chaos.c \ eelf_i386_fbsd.c \ eelf_i386_ldso.c \ eelf_i386_nacl.c \ @@ -1385,7 +1384,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64tilegx_be.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_be.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_chaos.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_fbsd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_ldso.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_nacl.Po@am__quote@ @@ -2897,9 +2895,6 @@ eelf_i386.c: $(srcdir)/emulparams/elf_i386.sh \ eelf_i386_be.c: $(srcdir)/emulparams/elf_i386_be.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} -eelf_i386_chaos.c: $(srcdir)/emulparams/elf_i386_chaos.sh \ - $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf_chaos.sc ${GEN_DEPENDS} - eelf_i386_fbsd.c: $(srcdir)/emulparams/elf_i386_fbsd.sh \ $(srcdir)/emulparams/elf_i386.sh \ $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} diff --git a/ld/configure.tgt b/ld/configure.tgt index beba17e..e92d448 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -315,7 +315,6 @@ x86_64-*-elf* | x86_64-*-rtems* | x86_64-*-fuchsia*) targ_extra_libpath="elf_i386 elf_iamcu elf32_x86_64 elf_l1om elf_k1om" tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; -i[3-7]86-*-kaos*) targ_emul=elf_i386 ;; i[3-7]86-*-dragonfly*) targ_emul=elf_i386 targ_extra_emuls="elf_iamcu i386bsd" ;; x86_64-*-dragonfly*) targ_emul=elf_x86_64 diff --git a/ld/emulparams/elf_i386_chaos.sh b/ld/emulparams/elf_i386_chaos.sh deleted file mode 100644 index ec2bb7f..0000000 --- a/ld/emulparams/elf_i386_chaos.sh +++ /dev/null @@ -1,15 +0,0 @@ -. ${srcdir}/emulparams/plt_unwind.sh -. ${srcdir}/emulparams/extern_protected_data.sh -. ${srcdir}/emulparams/dynamic_undefined_weak.sh -. ${srcdir}/emulparams/call_nop.sh -SCRIPT_NAME=elf_chaos -OUTPUT_FORMAT="elf32-i386" -EXTRA_EM_FILE="elf-x86" -TEXT_START_ADDR=0x40000000 -MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" -ARCH=i386 -MACHINE= -NOP=0x90909090 -TEMPLATE_NAME=elf32 -GENERATE_SHLIB_SCRIPT=yes -NO_SMALL_DATA=yes |