mipsel: drop Haiku mips. Fix multi-build.

Message ID 20210904043558.2360667-1-kallisti5@unixzen.com
State New
Headers show
Series
  • mipsel: drop Haiku mips. Fix multi-build.
Related show

Commit Message

Alexander von Gluck IV Sept. 4, 2021, 4:35 a.m.
* This slipped in and honestly shouldn't have.
* Causes a build failure on multi-build.
* Since MIPS is kinda dead, and little interest
  from us, drop it.
---
 bfd/config.bfd                    | 4 ----
 gas/configure.tgt                 | 1 -
 ld/Makefile.am                    | 1 -
 ld/Makefile.in                    | 2 --
 ld/configure.tgt                  | 3 ---
 ld/emulparams/elf_mipsel_haiku.sh | 3 ---
 ld/po/BLD-POTFILES.in             | 1 -
 7 files changed, 15 deletions(-)
 delete mode 100644 ld/emulparams/elf_mipsel_haiku.sh

-- 
2.33.0

Comments

Alan Modra via Binutils Sept. 8, 2021, 5:38 a.m. | #1
On 03 Sep 2021 23:35, Alexander von Gluck IV wrote:
> * This slipped in and honestly shouldn't have.

> * Causes a build failure on multi-build.

> * Since MIPS is kinda dead, and little interest

>   from us, drop it.


thanks, seems to fix my multitarget build
-mike

Patch

diff --git a/bfd/config.bfd b/bfd/config.bfd
index 7f7c12d4b2d..13abd3af49e 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -868,10 +868,6 @@  case "${targ}" in
     targ_defvec=mips_elf32_trad_be_vec
     targ_selvecs="mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
     ;;
-  mips*el-*-haiku*)
-    targ_defvec=mips_elf32_le_vec
-    targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_le_vec mips_ecoff_be_vec"
-    ;;
   mips*-*-irix6*)
     targ_defvec=mips_elf32_n_be_vec
     targ_selvecs="mips_elf32_n_le_vec mips_elf32_be_vec mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec"
diff --git a/gas/configure.tgt b/gas/configure.tgt
index 550fa4098f8..1e43ddaa6c3 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -313,7 +313,6 @@  case ${generic_target} in
   mips-*-sysv4* | mips-*-gnu*)		fmt=elf em=tmips ;;
   mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*)
 					fmt=elf em=tmips ;;
-  mips-*-haiku*)			fmt=elf em=haiku ;;
   mips-*-elf*)				fmt=elf ;;
   mips-*-netbsd*)			fmt=elf em=tmips ;;
   mips-*-openbsd*)			fmt=elf em=tmips ;;
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 6cfdfddc5d1..7fabb6a13ec 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -286,7 +286,6 @@  ALL_EMULATION_SOURCES = \
 	eelf_i386_sol2.c \
 	eelf_i386_vxworks.c \
 	eelf_iamcu.c \
-	eelf_mipsel_haiku.c \
 	eelf_s390.c \
 	eh8300elf.c \
 	eh8300elf_linux.c \
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 30fa918dfc8..a132c576d11 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -776,7 +776,6 @@  ALL_EMULATION_SOURCES = \
 	eelf_i386_sol2.c \
 	eelf_i386_vxworks.c \
 	eelf_iamcu.c \
-	eelf_mipsel_haiku.c \
 	eelf_s390.c \
 	eh8300elf.c \
 	eh8300elf_linux.c \
@@ -1451,7 +1450,6 @@  distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_k1om_fbsd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_l1om.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_l1om_fbsd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_mipsel_haiku.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_s390.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_cloudabi.Po@am__quote@
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 5411104ec36..2e13cc5f931 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -487,9 +487,6 @@  mips*-sgi-irix6*)	targ_emul=elf32bmipn32
 			targ_extra_emuls="elf32bsmip elf64bmip"
 			targ_extra_libpath=$targ_extra_emuls
 			;;
-mips*el-*-haiku*)	targ_emul=elf_mipsel_haiku
-			targ_extra_emuls="elf32ltsmip elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip"
-			;;
 mips*el-*-netbsd*)	targ_emul=elf32ltsmip
 			targ_extra_emuls="elf32btsmip elf64ltsmip elf64btsmip"
 			;;
diff --git a/ld/emulparams/elf_mipsel_haiku.sh b/ld/emulparams/elf_mipsel_haiku.sh
deleted file mode 100644
index ab38e2323cd..00000000000
--- a/ld/emulparams/elf_mipsel_haiku.sh
+++ /dev/null
@@ -1,3 +0,0 @@ 
-. ${srcdir}/emulparams/elf32lmip.sh
-. ${srcdir}/emulparams/elf_haiku.sh
-
diff --git a/ld/po/BLD-POTFILES.in b/ld/po/BLD-POTFILES.in
index 54975cd10c3..2772f0f8c31 100644
--- a/ld/po/BLD-POTFILES.in
+++ b/ld/po/BLD-POTFILES.in
@@ -209,7 +209,6 @@  eelf_k1om.c
 eelf_k1om_fbsd.c
 eelf_l1om.c
 eelf_l1om_fbsd.c
-eelf_mipsel_haiku.c
 eelf_s390.c
 eelf_x86_64.c
 eelf_x86_64_cloudabi.c