diff options
| -rw-r--r-- | bfd/ChangeLog | 4 | ||||
| -rw-r--r-- | bfd/config.bfd | 8 | ||||
| -rw-r--r-- | gas/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/configure.tgt | 2 | ||||
| -rw-r--r-- | gas/testsuite/gas/i386/i386.exp | 2 | ||||
| -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 |
10 files changed, 18 insertions, 37 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index a6aa196..6e85dc7 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2019-04-08 H.J. Lu <hongjiu.lu@intel.com> + + * config.bfd: Remove i[3-7]86-*-kaos* and i[3-7]86-*-chaos targets. + 2019-04-08 Alan Modra <amodra@gmail.com> * configure.ac (elfxx_x86): Define and use. diff --git a/bfd/config.bfd b/bfd/config.bfd index f13812b..8977d2a 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -577,10 +577,6 @@ case "${targ}" in want64=true ;; #endif - i[3-7]86-*-kaos*) - targ_defvec=i386_elf32_vec - targ_selvecs=i386_elf32_vec - ;; i[3-7]86-*-nto*) targ_defvec=i386_elf32_vec targ_selvecs="iamcu_elf32_vec i386_coff_vec" @@ -762,10 +758,6 @@ case "${targ}" in targ_defvec=i386_elf32_vxworks_vec targ_underscore=yes ;; - i[3-7]86-*-chaos) - targ_defvec=i386_elf32_vec - targ_selfvecs="iamcu_elf32_vec i386chaos_vec" - ;; ia16-*-elf) targ_defvec=i386_elf32_vec diff --git a/gas/ChangeLog b/gas/ChangeLog index 25e3093..50ddc6b 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2019-04-08 H.J. Lu <hongjiu.lu@intel.com> + + * configure.tgt: Remove i386-*-kaos* and i386-*-chaos targets. + * testsuite/gas/i386/i386.exp: Remove *-*-caos* and "*-*-kaos* + check. + 2019-04-05 H.J. Lu <hongjiu.lu@intel.com> * testsuite/gas/i386/i386.exp: Run -mx86-used-note=yes tests. diff --git a/gas/configure.tgt b/gas/configure.tgt index 616d211..e342acb 100644 --- a/gas/configure.tgt +++ b/gas/configure.tgt @@ -218,7 +218,6 @@ case ${generic_target} in i386-*-elfiamcu) fmt=elf arch=iamcu ;; i386-*-elf*) fmt=elf ;; i386-*-fuchsia*) fmt=elf ;; - i386-*-kaos*) fmt=elf ;; i386-*-bsd*) fmt=aout em=386bsd ;; i386-*-nacl*) fmt=elf em=nacl case ${cpu} in @@ -257,7 +256,6 @@ case ${generic_target} in esac ;; i386-*-nto-qnx*) fmt=elf ;; i386-*-*nt*) fmt=coff em=pe ;; - i386-*-chaos) fmt=elf ;; i386-*-rdos*) fmt=elf ;; i386-*-darwin*) fmt=macho ;; diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp index 7a36ae8..aa0ad7d 100644 --- a/gas/testsuite/gas/i386/i386.exp +++ b/gas/testsuite/gas/i386/i386.exp @@ -1002,8 +1002,6 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] t if { ![istarget "*-*-aix*"] && ![istarget "*-*-beos*"] && ![istarget "*-*-*bsd*"] - && ![istarget "*-*-chaos*"] - && ![istarget "*-*-kaos*"] && ![istarget "*-*-lynx*"] && ![istarget "*-*-moss*"] && ![istarget "*-*-nto-qnx*"] 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 |