x86: Remove i386-*-kaos* and i386-*-chaos targets

Remove i386-*-kaos* and i386-*-chaos targets since they are no longer
supported by config.sub:

$ .../config.sub i386-kaos
Invalid configuration `i386-kaos': system `kaos' not recognized
$ .../config.sub i386-chaos
Invalid configuration `i386-chaos': system `chaos' not recognized
$

bfd/

	* config.bfd: Remove i[3-7]86-*-kaos* and i[3-7]86-*-chaos targets.

gas/

	* configure.tgt: Remove i386-*-kaos* and i386-*-chaos targets.
	* testsuite/gas/i386/i386.exp: Remove *-*-caos* and "*-*-kaos*
	check.

ld/

	* 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.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a6aa1965cafb540618739f70267a21e2ae5e87e0..6e85dc797bdb3e387cb8a3e2c871922ccdf6ef5f 100644 (file)
--- 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 f13812b7c74291391311dbc14186468f689e31bf..8977d2a2a2148b16e5b8a6d1afc42b45bb8838a6 100644 (file)
--- 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 25e309371028cc2495ef3a84aec0ca09d86eb608..50ddc6bf696781623ab47bb731842e37ca7fd370 100644 (file)
--- 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 616d2113086dc22dbf1dc159b7cbf6c466f72852..e342acbc605116b6bcb02b18c878551c128b80ee 100644 (file)
--- 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 7a36ae8a0dd7ff7743dc1130d391ecadcb038b55..aa0ad7dc4bf52346a6ddc44381fe577f86554233 100644 (file)
--- 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 0e583a443a23beeb2cf2e541b6f2a88f3aa39cc3..2ac6cddee67052c4078410d701dfbff447d02d04 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+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.

diff --git a/ld/Makefile.am b/ld/Makefile.am
index 6d750c8db2049a9deaa8b855b287cf5a504898ef..199bacf5d74cea2da8c8154a5ff3aba949fba0bd 100644 (file)
--- 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 0f3c11a31e7f5089431a44c7419e49c99ead4b90..edaf530a65b4702764249cd5570a7d899a6f5250 100644 (file)
--- 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 beba17ef513576f5a4565cd4e367249f6ea23315..e92d4484b4f412bff94fa90631c897dd8b9fd062 100644 (file)
--- 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 (file)
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