[PATCH 1/2] opcodes: Drop bfd_arch_l1om/bfd_arch_k1om support

[PATCH 1/2] opcodes: Drop bfd_arch_l1om/bfd_arch_k1om support

[H.J. Lu]

L1OM/K1OM support has been removed from gas and ld.

	* configure.ac: Remove bfd_arch_l1om/bfd_arch_k1om references.
	* disassemble.c (disassembler): Likewise.
	* configure: Regenerate.
---
 opcodes/configure     | 2 +-
 opcodes/configure.ac  | 2 +-
 opcodes/disassemble.c | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/opcodes/configure b/opcodes/configure
index c98c5bcd0d1..d8d518a346a 100755
--- a/opcodes/configure
+++ b/opcodes/configure
@@ -12509,7 +12509,7 @@ if test x${all_targets} = xfalse ; then
 	bfd_moxie_arch)		ta="$ta moxie-dis.lo moxie-opc.lo" ;;
 	bfd_h8300_arch)		ta="$ta h8300-dis.lo" ;;
 	bfd_hppa_arch)		ta="$ta hppa-dis.lo" ;;
-	bfd_i386_arch|bfd_iamcu_arch|bfd_l1om_arch|bfd_k1om_arch)
+	bfd_i386_arch|bfd_iamcu_arch)
 				ta="$ta i386-dis.lo i386-opc.lo" ;;
 	bfd_ia64_arch)		ta="$ta ia64-dis.lo ia64-opc.lo" ;;
 	bfd_ip2k_arch)		ta="$ta ip2k-asm.lo ip2k-desc.lo ip2k-dis.lo ip2k-ibld.lo ip2k-opc.lo" using_cgen=yes ;;
diff --git a/opcodes/configure.ac b/opcodes/configure.ac
index dc340c4d110..006a95d8704 100644
--- a/opcodes/configure.ac
+++ b/opcodes/configure.ac
@@ -281,7 +281,7 @@ if test x${all_targets} = xfalse ; then
 	bfd_moxie_arch)		ta="$ta moxie-dis.lo moxie-opc.lo" ;;
 	bfd_h8300_arch)		ta="$ta h8300-dis.lo" ;;
 	bfd_hppa_arch)		ta="$ta hppa-dis.lo" ;;
-	bfd_i386_arch|bfd_iamcu_arch|bfd_l1om_arch|bfd_k1om_arch)
+	bfd_i386_arch|bfd_iamcu_arch)
 				ta="$ta i386-dis.lo i386-opc.lo" ;;
 	bfd_ia64_arch)		ta="$ta ia64-dis.lo ia64-opc.lo" ;;
 	bfd_ip2k_arch)		ta="$ta ip2k-asm.lo ip2k-desc.lo ip2k-dis.lo ip2k-ibld.lo ip2k-opc.lo" using_cgen=yes ;;
diff --git a/opcodes/disassemble.c b/opcodes/disassemble.c
index e613935eff8..1f1fde7ae8f 100644
--- a/opcodes/disassemble.c
+++ b/opcodes/disassemble.c
@@ -229,8 +229,6 @@ disassembler (enum bfd_architecture a,
 #ifdef ARCH_i386
     case bfd_arch_i386:
     case bfd_arch_iamcu:
-    case bfd_arch_l1om:
-    case bfd_arch_k1om:
       disassemble = print_insn_i386;
       break;
 #endif
-- 
2.35.1

[PATCH 2/2] bfd: Remove bfd_arch_l1om and bfd_arch_k1om

[H.J. Lu]

Remove bfd_arch_l1om and bfd_arch_k1om since L1OM/K1OM support has been
removed from gas, ld and opcodes.

	* Makefile.am (ALL_MACHINES): Remove cpu-l1om.lo and cpu-k1om.lo.
	(ALL_MACHINES_CFILES): Remove cpu-l1om.c and cpu-k1om.c.
	* archures.c (bfd_mach_l1om): Removed.
	(bfd_mach_l1om_intel_syntax): Likewise.
	(bfd_mach_k1om): Likewise.
	(bfd_mach_k1om_intel_syntax): Likewise.
	(bfd_k1om_arch): Likewise.
	(bfd_l1om_arch): Likewise.
	(bfd_archures_list): Remove bfd_k1om_arch and bfd_l1om_arch
	references.
	* config.bfd (targ_selvecs): Remove l1om_elf64_vec.
	l1om_elf64_fbsd_vec, k1om_elf64_vec and k1om_elf64_fbsd_vec.
	(targ_archs): Remove bfd_l1om_arch and bfd_k1om_arch.
	* configure.ac (k1om_elf64_vec): Removed.
	(k1om_elf64_fbsd_vec): Likewise.
	(l1om_elf64_vec): Likewise.
	(l1om_elf64_fbsd_vec): Likewise.
	* cpu-k1om.c: Removed.
	* cpu-l1om.c: Likewise.
	* elf64-x86-64.c (elf64_l1om_elf_object_p): Removed.
	(elf64_k1om_elf_object_p): Likewise.
	(l1om_elf64_vec): Removed.
	(l1om_elf64_fbsd_vec): Likewise.
	(k1om_elf64_vec): Likewise.
	(k1om_elf64_fbsd_vec): Likewise.
	* targets.c (_bfd_target_vector): Remove k1om_elf64_vec,
	k1om_elf64_fbsd_vec, l1om_elf64_vec and l1om_elf64_fbsd_vec.
	* Makefile.in: Regenerate.
	* bfd-in2.h: Likewise.
	* configure: Likewise.
---
 bfd/Makefile.am    |  4 --
 bfd/Makefile.in    |  6 ---
 bfd/archures.c     | 10 -----
 bfd/bfd-in2.h      |  6 ---
 bfd/config.bfd     | 42 +++++++--------------
 bfd/configure      |  4 --
 bfd/configure.ac   |  4 --
 bfd/cpu-k1om.c     | 37 ------------------
 bfd/cpu-l1om.c     | 36 ------------------
 bfd/elf64-x86-64.c | 93 ----------------------------------------------
 bfd/targets.c      | 11 ------
 11 files changed, 14 insertions(+), 239 deletions(-)
 delete mode 100644 bfd/cpu-k1om.c
 delete mode 100644 bfd/cpu-l1om.c

diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index b9a3f8207ac..f2f70590e88 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -118,8 +118,6 @@ ALL_MACHINES = \
 	cpu-hppa.lo \
 	cpu-i386.lo \
 	cpu-iamcu.lo \
-	cpu-l1om.lo \
-	cpu-k1om.lo \
 	cpu-ia64.lo \
 	cpu-ip2k.lo \
 	cpu-iq2000.lo \
@@ -204,8 +202,6 @@ ALL_MACHINES_CFILES = \
 	cpu-hppa.c \
 	cpu-i386.c \
 	cpu-iamcu.c \
-	cpu-l1om.c \
-	cpu-k1om.c \
 	cpu-ia64.c \
 	cpu-ip2k.c \
 	cpu-iq2000.c \
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 934dd4bc066..3068560c48b 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -585,8 +585,6 @@ ALL_MACHINES = \
 	cpu-hppa.lo \
 	cpu-i386.lo \
 	cpu-iamcu.lo \
-	cpu-l1om.lo \
-	cpu-k1om.lo \
 	cpu-ia64.lo \
 	cpu-ip2k.lo \
 	cpu-iq2000.lo \
@@ -671,8 +669,6 @@ ALL_MACHINES_CFILES = \
 	cpu-hppa.c \
 	cpu-i386.c \
 	cpu-iamcu.c \
-	cpu-l1om.c \
-	cpu-k1om.c \
 	cpu-ia64.c \
 	cpu-ip2k.c \
 	cpu-iq2000.c \
@@ -1508,8 +1504,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-iamcu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-ip2k.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-iq2000.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-k1om.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-l1om.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-lm32.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-loongarch.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-m10200.Plo@am__quote@
diff --git a/bfd/archures.c b/bfd/archures.c
index fac9fe82a08..bcd2b1cf48b 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -205,12 +205,6 @@ DESCRIPTION
 .#define bfd_mach_i386_i386_intel_syntax (bfd_mach_i386_i386 | bfd_mach_i386_intel_syntax)
 .#define bfd_mach_x86_64_intel_syntax	(bfd_mach_x86_64 | bfd_mach_i386_intel_syntax)
 .#define bfd_mach_x64_32_intel_syntax	(bfd_mach_x64_32 | bfd_mach_i386_intel_syntax)
-.  bfd_arch_l1om,      {* Intel L1OM.  *}
-.#define bfd_mach_l1om			(1 << 5)
-.#define bfd_mach_l1om_intel_syntax	(bfd_mach_l1om | bfd_mach_i386_intel_syntax)
-.  bfd_arch_k1om,      {* Intel K1OM.  *}
-.#define bfd_mach_k1om			(1 << 6)
-.#define bfd_mach_k1om_intel_syntax	(bfd_mach_k1om | bfd_mach_i386_intel_syntax)
 .  bfd_arch_iamcu,     {* Intel MCU.  *}
 .#define bfd_mach_iamcu			(1 << 8)
 .#define bfd_mach_i386_iamcu		(bfd_mach_i386_i386 | bfd_mach_iamcu)
@@ -650,8 +644,6 @@ extern const bfd_arch_info_type bfd_iamcu_arch;
 extern const bfd_arch_info_type bfd_ia64_arch;
 extern const bfd_arch_info_type bfd_ip2k_arch;
 extern const bfd_arch_info_type bfd_iq2000_arch;
-extern const bfd_arch_info_type bfd_k1om_arch;
-extern const bfd_arch_info_type bfd_l1om_arch;
 extern const bfd_arch_info_type bfd_lm32_arch;
 extern const bfd_arch_info_type bfd_loongarch_arch;
 extern const bfd_arch_info_type bfd_m32c_arch;
@@ -741,8 +733,6 @@ static const bfd_arch_info_type * const bfd_archures_list[] =
     &bfd_ia64_arch,
     &bfd_ip2k_arch,
     &bfd_iq2000_arch,
-    &bfd_k1om_arch,
-    &bfd_l1om_arch,
     &bfd_lm32_arch,
     &bfd_loongarch_arch,
     &bfd_m32c_arch,
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index c0b563aec02..bf3b6c66fd0 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1584,12 +1584,6 @@ enum bfd_architecture
 #define bfd_mach_i386_i386_intel_syntax (bfd_mach_i386_i386 | bfd_mach_i386_intel_syntax)
 #define bfd_mach_x86_64_intel_syntax   (bfd_mach_x86_64 | bfd_mach_i386_intel_syntax)
 #define bfd_mach_x64_32_intel_syntax   (bfd_mach_x64_32 | bfd_mach_i386_intel_syntax)
-  bfd_arch_l1om,      /* Intel L1OM.  */
-#define bfd_mach_l1om                  (1 << 5)
-#define bfd_mach_l1om_intel_syntax     (bfd_mach_l1om | bfd_mach_i386_intel_syntax)
-  bfd_arch_k1om,      /* Intel K1OM.  */
-#define bfd_mach_k1om                  (1 << 6)
-#define bfd_mach_k1om_intel_syntax     (bfd_mach_k1om | bfd_mach_i386_intel_syntax)
   bfd_arch_iamcu,     /* Intel MCU.  */
 #define bfd_mach_iamcu                 (1 << 8)
 #define bfd_mach_i386_iamcu            (bfd_mach_i386_i386 | bfd_mach_iamcu)
diff --git a/bfd/config.bfd b/bfd/config.bfd
index 872685cfb72..d33722decd0 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -590,13 +590,13 @@ case "${targ}" in
   i[3-7]86-*-solaris2*)
     targ_defvec=i386_elf32_sol2_vec
     targ_selvecs="iamcu_elf32_vec i386_coff_vec i386_pei_vec"
-    targ64_selvecs="x86_64_elf64_sol2_vec l1om_elf64_vec k1om_elf64_vec x86_64_pe_vec x86_64_pei_vec"
+    targ64_selvecs="x86_64_elf64_sol2_vec x86_64_pe_vec x86_64_pei_vec"
     want64=true
     ;;
 #ifdef BFD64
   x86_64-*-solaris2*)
     targ_defvec=i386_elf32_sol2_vec
-    targ_selvecs="x86_64_elf64_sol2_vec l1om_elf64_vec k1om_elf64_vec iamcu_elf32_vec i386_coff_vec i386_pei_vec x86_64_pe_vec x86_64_pei_vec"
+    targ_selvecs="x86_64_elf64_sol2_vec iamcu_elf32_vec i386_coff_vec i386_pei_vec x86_64_pe_vec x86_64_pei_vec"
     want64=true
     ;;
 #endif
@@ -611,7 +611,7 @@ case "${targ}" in
   i[3-7]86-*-dicos*)
     targ_defvec=i386_elf32_vec
     targ_selvecs=iamcu_elf32_vec
-    targ64_selvecs="x86_64_elf64_vec l1om_elf64_vec k1om_elf64_vec"
+    targ64_selvecs="x86_64_elf64_vec"
     ;;
   *-*-msdosdjgpp* | *-*-go32* )
     targ_defvec=i386_coff_go32_vec
@@ -630,12 +630,12 @@ case "${targ}" in
   i[3-7]86-*-dragonfly*)
     targ_defvec=i386_elf32_vec
     targ_selvecs=iamcu_elf32_vec
-    targ64_selvecs="x86_64_elf64_vec l1om_elf64_vec k1om_elf64_vec"
+    targ64_selvecs="x86_64_elf64_vec"
     ;;
   i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu)
     targ_defvec=i386_elf32_fbsd_vec
     targ_selvecs="i386_elf32_vec iamcu_elf32_vec i386_pei_vec i386_coff_vec"
-    targ64_selvecs="x86_64_elf64_fbsd_vec x86_64_elf64_vec x86_64_pe_vec x86_64_pei_vec l1om_elf64_vec l1om_elf64_fbsd_vec k1om_elf64_vec k1om_elf64_fbsd_vec"
+    targ64_selvecs="x86_64_elf64_fbsd_vec x86_64_elf64_vec x86_64_pe_vec x86_64_pei_vec"
     # FreeBSD <= 4.0 supports only the old nonstandard way of ABI labelling.
     case "${targ}" in
       i[3-7]86-*-freebsd3* | i[3-7]86-*-freebsd4 | i[3-7]86-*-freebsd4.0*)
@@ -645,7 +645,7 @@ case "${targ}" in
   i[3-7]86-*-netbsd* | i[3-7]86-*-knetbsd*-gnu)
     targ_defvec=i386_elf32_vec
     targ_selvecs="iamcu_elf32_vec"
-    targ64_selvecs="x86_64_elf64_vec l1om_elf64_vec k1om_elf64_vec"
+    targ64_selvecs="x86_64_elf64_vec"
     ;;
   i[3-7]86-*-openbsd*)
     targ_defvec=i386_elf32_vec
@@ -654,7 +654,7 @@ case "${targ}" in
   i[3-7]86-*-linux-*)
     targ_defvec=i386_elf32_vec
     targ_selvecs="iamcu_elf32_vec i386_pei_vec"
-    targ64_selvecs="x86_64_elf64_vec x86_64_elf32_vec x86_64_pe_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec"
+    targ64_selvecs="x86_64_elf64_vec x86_64_elf32_vec x86_64_pe_vec x86_64_pei_vec"
     ;;
   i[3-7]86-*-redox*)
     targ_defvec=i386_elf32_vec
@@ -674,12 +674,12 @@ case "${targ}" in
     ;;
   x86_64-*-dicos*)
     targ_defvec=x86_64_elf64_vec
-    targ_selvecs="i386_elf32_vec iamcu_elf32_vec l1om_elf64_vec k1om_elf64_vec"
+    targ_selvecs="i386_elf32_vec iamcu_elf32_vec"
     want64=true
     ;;
   x86_64-*-elf* | x86_64-*-rtems* | x86_64-*-fuchsia | x86_64-*-genode*)
     targ_defvec=x86_64_elf64_vec
-    targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec l1om_elf64_vec k1om_elf64_vec"
+    targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec"
     case "${targ}" in
       x86_64-*-rtems*)
     targ_selvecs="${targ_selvecs} x86_64_pe_vec x86_64_pei_vec"
@@ -688,12 +688,12 @@ case "${targ}" in
     ;;
   x86_64-*-dragonfly*)
     targ_defvec=x86_64_elf64_vec
-    targ_selvecs="i386_elf32_vec iamcu_elf32_vec l1om_elf64_vec k1om_elf64_vec"
+    targ_selvecs="i386_elf32_vec iamcu_elf32_vec"
     want64=true
     ;;
   x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
     targ_defvec=x86_64_elf64_fbsd_vec
-    targ_selvecs="i386_elf32_fbsd_vec iamcu_elf32_vec i386_coff_vec i386_pei_vec x86_64_pe_vec x86_64_pei_vec i386_elf32_vec x86_64_elf64_vec l1om_elf64_vec l1om_elf64_fbsd_vec k1om_elf64_vec k1om_elf64_fbsd_vec"
+    targ_selvecs="i386_elf32_fbsd_vec iamcu_elf32_vec i386_coff_vec i386_pei_vec x86_64_pe_vec x86_64_pei_vec i386_elf32_vec x86_64_elf64_vec"
     want64=true
     ;;
   x86_64-*-haiku*)
@@ -703,17 +703,17 @@ case "${targ}" in
     ;;
   x86_64-*-netbsd* | x86_64-*-openbsd*)
     targ_defvec=x86_64_elf64_vec
-    targ_selvecs="i386_elf32_vec iamcu_elf32_vec i386_coff_vec i386_pei_vec x86_64_pe_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec"
+    targ_selvecs="i386_elf32_vec iamcu_elf32_vec i386_coff_vec i386_pei_vec x86_64_pe_vec x86_64_pei_vec"
     want64=true
     ;;
   x86_64-*-linux-*)
     targ_defvec=x86_64_elf64_vec
-    targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pe_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec"
+    targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pe_vec x86_64_pei_vec"
     want64=true
     ;;
   x86_64-*-mingw* | x86_64-*-pe | x86_64-*-pep | x86_64-*-cygwin)
     targ_defvec=x86_64_pe_vec
-    targ_selvecs="x86_64_pe_vec x86_64_pei_vec x86_64_pe_big_vec x86_64_elf64_vec l1om_elf64_vec k1om_elf64_vec i386_pe_vec i386_pei_vec i386_elf32_vec iamcu_elf32_vec"
+    targ_selvecs="x86_64_pe_vec x86_64_pei_vec x86_64_pe_big_vec x86_64_elf64_vec i386_pe_vec i386_pei_vec i386_elf32_vec iamcu_elf32_vec"
     want64=true
     targ_underscore=no
     ;;
@@ -1525,17 +1525,3 @@ case "${targ_defvec} ${targ_selvecs}" in
     targ_archs="$targ_archs bfd_iamcu_arch"
     ;;
 esac
-
-# If we support Intel L1OM target, then add support for bfd_l1om_arch.
-case "${targ_defvec} ${targ_selvecs}" in
-  *l1om_elf64*)
-    targ_archs="$targ_archs bfd_l1om_arch"
-    ;;
-esac
-
-# If we support Intel K1OM target, then add support for bfd_k1om_arch.
-case "${targ_defvec} ${targ_selvecs}" in
-  *k1om_elf64*)
-    targ_archs="$targ_archs bfd_k1om_arch"
-    ;;
-esac
diff --git a/bfd/configure b/bfd/configure
index 0ef4c206fb0..2ea7aeffd8a 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -13444,10 +13444,6 @@ do
     ia64_pei_vec)		 tb="$tb pei-ia64.lo pepigen.lo $coff"; target_size=64 ;;
     ip2k_elf32_vec)		 tb="$tb elf32-ip2k.lo elf32.lo $elf" ;;
     iq2000_elf32_vec)		 tb="$tb elf32-iq2000.lo elf32.lo $elf" ;;
-    k1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
-    k1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
-    l1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
-    l1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
     lm32_elf32_vec)		 tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
     lm32_elf32_fdpic_vec)	 tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
     loongarch_elf32_vec)	 tb="$tb elf32-loongarch.lo elfxx-loongarch.lo elf32.lo elf-ifunc.lo $elf" ;;
diff --git a/bfd/configure.ac b/bfd/configure.ac
index 9e873736792..8004c3ef4bf 100644
--- a/bfd/configure.ac
+++ b/bfd/configure.ac
@@ -523,10 +523,6 @@ do
     ia64_pei_vec)		 tb="$tb pei-ia64.lo pepigen.lo $coff"; target_size=64 ;;
     ip2k_elf32_vec)		 tb="$tb elf32-ip2k.lo elf32.lo $elf" ;;
     iq2000_elf32_vec)		 tb="$tb elf32-iq2000.lo elf32.lo $elf" ;;
-    k1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
-    k1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
-    l1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
-    l1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
     lm32_elf32_vec)		 tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
     lm32_elf32_fdpic_vec)	 tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
     loongarch_elf32_vec)	 tb="$tb elf32-loongarch.lo elfxx-loongarch.lo elf32.lo elf-ifunc.lo $elf" ;;
diff --git a/bfd/cpu-k1om.c b/bfd/cpu-k1om.c
deleted file mode 100644
index 3f8aed03e97..00000000000
--- a/bfd/cpu-k1om.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* BFD support for the Intel K1OM architecture.
-   Copyright (C) 2011-2022 Free Software Foundation, Inc.
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
-   MA 02110-1301, USA.  */
-
-#include "sysdep.h"
-#include "bfd.h"
-#include "libbfd.h"
-
-extern void *bfd_arch_i386_short_nop_fill (bfd_size_type, bool, bool);
-
-#define N(number, name, print, next)				\
-  { 64, 64, 8, bfd_arch_k1om, number, name, print, 3, true,	\
-    bfd_default_compatible, bfd_default_scan,			\
-    bfd_arch_i386_short_nop_fill, next, 9 }
-
-static const bfd_arch_info_type bfd_k1om_arch_intel_syntax =
-  N (bfd_mach_k1om_intel_syntax, "k1om:intel", "k1om:intel", NULL);
-
-const bfd_arch_info_type bfd_k1om_arch =
-  N (bfd_mach_k1om, "k1om", "k1om", &bfd_k1om_arch_intel_syntax);
-
diff --git a/bfd/cpu-l1om.c b/bfd/cpu-l1om.c
deleted file mode 100644
index 639980c67c6..00000000000
--- a/bfd/cpu-l1om.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* BFD support for the Intel L1OM architecture.
-   Copyright (C) 2009-2022 Free Software Foundation, Inc.
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
-   MA 02110-1301, USA.  */
-
-#include "sysdep.h"
-#include "bfd.h"
-#include "libbfd.h"
-
-extern void *bfd_arch_i386_short_nop_fill (bfd_size_type, bool, bool);
-
-#define N(number, name, print, next)				\
-  { 64, 64, 8, bfd_arch_l1om, number, name, print, 3, true,	\
-    bfd_default_compatible, bfd_default_scan,			\
-    bfd_arch_i386_short_nop_fill, next, 0 }
-
-static const bfd_arch_info_type bfd_l1om_arch_intel_syntax =
-  N (bfd_mach_l1om_intel_syntax, "l1om:intel", "l1om:intel", NULL);
-
-const bfd_arch_info_type bfd_l1om_arch =
-  N (bfd_mach_l1om, "l1om", "l1om", &bfd_l1om_arch_intel_syntax);
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index b5718e71121..78428f29736 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -5412,99 +5412,6 @@ elf64_x86_64_copy_solaris_special_section_fields (const bfd *ibfd ATTRIBUTE_UNUS
 #undef  elf_backend_strtab_flags
 #undef  elf_backend_copy_special_section_fields
 
-/* Intel L1OM support.  */
-
-static bool
-elf64_l1om_elf_object_p (bfd *abfd)
-{
-  /* Set the right machine number for an L1OM elf64 file.  */
-  bfd_default_set_arch_mach (abfd, bfd_arch_l1om, bfd_mach_l1om);
-  return true;
-}
-
-#undef  TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM		    l1om_elf64_vec
-#undef  TARGET_LITTLE_NAME
-#define TARGET_LITTLE_NAME		    "elf64-l1om"
-#undef ELF_ARCH
-#define ELF_ARCH			    bfd_arch_l1om
-
-#undef	ELF_MACHINE_CODE
-#define ELF_MACHINE_CODE		    EM_L1OM
-
-#undef	ELF_OSABI
-
-#undef  elf64_bed
-#define elf64_bed elf64_l1om_bed
-
-#undef elf_backend_object_p
-#define elf_backend_object_p		    elf64_l1om_elf_object_p
-
-/* Restore defaults.  */
-#undef ELF_TARGET_OS
-
-#include "elf64-target.h"
-
-/* FreeBSD L1OM support.  */
-
-#undef  TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM		    l1om_elf64_fbsd_vec
-#undef  TARGET_LITTLE_NAME
-#define TARGET_LITTLE_NAME		    "elf64-l1om-freebsd"
-
-#undef	ELF_OSABI
-#define	ELF_OSABI			    ELFOSABI_FREEBSD
-
-#undef  elf64_bed
-#define elf64_bed elf64_l1om_fbsd_bed
-
-#include "elf64-target.h"
-
-/* Intel K1OM support.  */
-
-static bool
-elf64_k1om_elf_object_p (bfd *abfd)
-{
-  /* Set the right machine number for an K1OM elf64 file.  */
-  bfd_default_set_arch_mach (abfd, bfd_arch_k1om, bfd_mach_k1om);
-  return true;
-}
-
-#undef  TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM		    k1om_elf64_vec
-#undef  TARGET_LITTLE_NAME
-#define TARGET_LITTLE_NAME		    "elf64-k1om"
-#undef ELF_ARCH
-#define ELF_ARCH			    bfd_arch_k1om
-
-#undef	ELF_MACHINE_CODE
-#define ELF_MACHINE_CODE		    EM_K1OM
-
-#undef	ELF_OSABI
-
-#undef  elf64_bed
-#define elf64_bed elf64_k1om_bed
-
-#undef elf_backend_object_p
-#define elf_backend_object_p		    elf64_k1om_elf_object_p
-
-#include "elf64-target.h"
-
-/* FreeBSD K1OM support.  */
-
-#undef  TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM		    k1om_elf64_fbsd_vec
-#undef  TARGET_LITTLE_NAME
-#define TARGET_LITTLE_NAME		    "elf64-k1om-freebsd"
-
-#undef	ELF_OSABI
-#define	ELF_OSABI			    ELFOSABI_FREEBSD
-
-#undef  elf64_bed
-#define elf64_bed elf64_k1om_fbsd_bed
-
-#include "elf64-target.h"
-
 /* 32bit x86-64 support.  */
 
 #undef  TARGET_LITTLE_SYM
diff --git a/bfd/targets.c b/bfd/targets.c
index 417743efc0e..05dd8236d91 100644
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -764,10 +764,6 @@ extern const bfd_target ia64_elf64_vms_vec;
 extern const bfd_target ia64_pei_vec;
 extern const bfd_target ip2k_elf32_vec;
 extern const bfd_target iq2000_elf32_vec;
-extern const bfd_target k1om_elf64_vec;
-extern const bfd_target k1om_elf64_fbsd_vec;
-extern const bfd_target l1om_elf64_vec;
-extern const bfd_target l1om_elf64_fbsd_vec;
 extern const bfd_target lm32_elf32_vec;
 extern const bfd_target lm32_elf32_fdpic_vec;
 extern const bfd_target loongarch_elf64_vec;
@@ -1127,13 +1123,6 @@ static const bfd_target * const _bfd_target_vector[] =
 	&ip2k_elf32_vec,
 	&iq2000_elf32_vec,
 
-#ifdef BFD64
-	&k1om_elf64_vec,
-	&k1om_elf64_fbsd_vec,
-	&l1om_elf64_vec,
-	&l1om_elf64_fbsd_vec,
-#endif
-
 	&lm32_elf32_vec,
 
 	&m32c_elf32_vec,
-- 
2.35.1

Re: [PATCH 2/2] bfd: Remove bfd_arch_l1om and bfd_arch_k1om

[Jan Beulich]

On 24.03.2022 20:23, H.J. Lu wrote:
> Remove bfd_arch_l1om and bfd_arch_k1om since L1OM/K1OM support has been
> removed from gas, ld and opcodes.

As said in a post-commit-message comment of the patch removing support
from ld/, I'd prefer to keep e.g. elfedit functioning for these targets.
Maybe not necessarily for the input, but at least for the output. Else
there's no way for people to create such objects anymore, forcing them
to resort to hex-editing of files, which I view as undesirable. I think
this 2nd patch goes against that; I'm not sure in how far the 1st one
would still allow this to function.

Jan

Re: [PATCH 2/2] bfd: Remove bfd_arch_l1om and bfd_arch_k1om

[H.J. Lu]

On Fri, Mar 25, 2022 at 1:21 AM Jan Beulich <jbeulich@suse.com> wrote:
>
> On 24.03.2022 20:23, H.J. Lu wrote:
> > Remove bfd_arch_l1om and bfd_arch_k1om since L1OM/K1OM support has been
> > removed from gas, ld and opcodes.
>
> As said in a post-commit-message comment of the patch removing support
> from ld/, I'd prefer to keep e.g. elfedit functioning for these targets.

elfedit doesn't need bfd_arch_l1om nor bfd_arch_k1om.

> Maybe not necessarily for the input, but at least for the output. Else
> there's no way for people to create such objects anymore, forcing them
> to resort to hex-editing of files, which I view as undesirable. I think
> this 2nd patch goes against that; I'm not sure in how far the 1st one
> would still allow this to function.

People can use the older binutils.

-- 
H.J.

Re: [PATCH 2/2] bfd: Remove bfd_arch_l1om and bfd_arch_k1om

[Jan Beulich]

On 25.03.2022 15:22, H.J. Lu wrote:
> On Fri, Mar 25, 2022 at 1:21 AM Jan Beulich <jbeulich@suse.com> wrote:
>>
>> On 24.03.2022 20:23, H.J. Lu wrote:
>>> Remove bfd_arch_l1om and bfd_arch_k1om since L1OM/K1OM support has been
>>> removed from gas, ld and opcodes.
>>
>> As said in a post-commit-message comment of the patch removing support
>> from ld/, I'd prefer to keep e.g. elfedit functioning for these targets.
> 
> elfedit doesn't need bfd_arch_l1om nor bfd_arch_k1om.

Oh, okay. (I didn't check how it actually works internally.)

>> Maybe not necessarily for the input, but at least for the output. Else
>> there's no way for people to create such objects anymore, forcing them
>> to resort to hex-editing of files, which I view as undesirable. I think
>> this 2nd patch goes against that; I'm not sure in how far the 1st one
>> would still allow this to function.
> 
> People can use the older binutils.

Hmm, well, yes, that's possible, but not very nice. But according to
your reply further up I take it that it'll continue to function anyway?

Jan

Re: [PATCH 2/2] bfd: Remove bfd_arch_l1om and bfd_arch_k1om

[H.J. Lu]

On Fri, Mar 25, 2022 at 7:28 AM Jan Beulich <jbeulich@suse.com> wrote:
>
> On 25.03.2022 15:22, H.J. Lu wrote:
> > On Fri, Mar 25, 2022 at 1:21 AM Jan Beulich <jbeulich@suse.com> wrote:
> >>
> >> On 24.03.2022 20:23, H.J. Lu wrote:
> >>> Remove bfd_arch_l1om and bfd_arch_k1om since L1OM/K1OM support has been
> >>> removed from gas, ld and opcodes.
> >>
> >> As said in a post-commit-message comment of the patch removing support
> >> from ld/, I'd prefer to keep e.g. elfedit functioning for these targets.
> >
> > elfedit doesn't need bfd_arch_l1om nor bfd_arch_k1om.
>
> Oh, okay. (I didn't check how it actually works internally.)
>
> >> Maybe not necessarily for the input, but at least for the output. Else
> >> there's no way for people to create such objects anymore, forcing them
> >> to resort to hex-editing of files, which I view as undesirable. I think
> >> this 2nd patch goes against that; I'm not sure in how far the 1st one
> >> would still allow this to function.
> >
> > People can use the older binutils.
>
> Hmm, well, yes, that's possible, but not very nice. But according to
> your reply further up I take it that it'll continue to function anyway?

We have removed L1OM/K1OM support from ld, gas and objdump.
What else do we support L1OM/K1OM?

-- 
H.J.

Re: [PATCH 2/2] bfd: Remove bfd_arch_l1om and bfd_arch_k1om

[Jan Beulich]

On 25.03.2022 15:36, H.J. Lu wrote:
> On Fri, Mar 25, 2022 at 7:28 AM Jan Beulich <jbeulich@suse.com> wrote:
>>
>> On 25.03.2022 15:22, H.J. Lu wrote:
>>> On Fri, Mar 25, 2022 at 1:21 AM Jan Beulich <jbeulich@suse.com> wrote:
>>>>
>>>> On 24.03.2022 20:23, H.J. Lu wrote:
>>>>> Remove bfd_arch_l1om and bfd_arch_k1om since L1OM/K1OM support has been
>>>>> removed from gas, ld and opcodes.
>>>>
>>>> As said in a post-commit-message comment of the patch removing support
>>>> from ld/, I'd prefer to keep e.g. elfedit functioning for these targets.
>>>
>>> elfedit doesn't need bfd_arch_l1om nor bfd_arch_k1om.
>>
>> Oh, okay. (I didn't check how it actually works internally.)
>>
>>>> Maybe not necessarily for the input, but at least for the output. Else
>>>> there's no way for people to create such objects anymore, forcing them
>>>> to resort to hex-editing of files, which I view as undesirable. I think
>>>> this 2nd patch goes against that; I'm not sure in how far the 1st one
>>>> would still allow this to function.
>>>
>>> People can use the older binutils.
>>
>> Hmm, well, yes, that's possible, but not very nice. But according to
>> your reply further up I take it that it'll continue to function anyway?
> 
> We have removed L1OM/K1OM support from ld, gas and objdump.
> What else do we support L1OM/K1OM?

I'm afraid I don't understand the question.

Jan

Re: [PATCH 2/2] bfd: Remove bfd_arch_l1om and bfd_arch_k1om

[H.J. Lu]

On Fri, Mar 25, 2022, 8:26 AM Jan Beulich <jbeulich@suse.com> wrote:

> On 25.03.2022 15:36, H.J. Lu wrote:
> > On Fri, Mar 25, 2022 at 7:28 AM Jan Beulich <jbeulich@suse.com> wrote:
> >>
> >> On 25.03.2022 15:22, H.J. Lu wrote:
> >>> On Fri, Mar 25, 2022 at 1:21 AM Jan Beulich <jbeulich@suse.com> wrote:
> >>>>
> >>>> On 24.03.2022 20:23, H.J. Lu wrote:
> >>>>> Remove bfd_arch_l1om and bfd_arch_k1om since L1OM/K1OM support has
> been
> >>>>> removed from gas, ld and opcodes.
> >>>>
> >>>> As said in a post-commit-message comment of the patch removing support
> >>>> from ld/, I'd prefer to keep e.g. elfedit functioning for these
> targets.
> >>>
> >>> elfedit doesn't need bfd_arch_l1om nor bfd_arch_k1om.
> >>
> >> Oh, okay. (I didn't check how it actually works internally.)
> >>
> >>>> Maybe not necessarily for the input, but at least for the output. Else
> >>>> there's no way for people to create such objects anymore, forcing them
> >>>> to resort to hex-editing of files, which I view as undesirable. I
> think
> >>>> this 2nd patch goes against that; I'm not sure in how far the 1st one
> >>>> would still allow this to function.
> >>>
> >>> People can use the older binutils.
> >>
> >> Hmm, well, yes, that's possible, but not very nice. But according to
> >> your reply further up I take it that it'll continue to function anyway?
> >
> > We have removed L1OM/K1OM support from ld, gas and objdump.
> > What else do we support L1OM/K1OM?
>
> I'm afraid I don't understand the question.
>
> Jan
>

> What support do my patches remove?

Re: [PATCH 2/2] bfd: Remove bfd_arch_l1om and bfd_arch_k1om

[H.J. Lu]

On Fri, Mar 25, 2022 at 8:26 AM Jan Beulich <jbeulich@suse.com> wrote:
>
> On 25.03.2022 15:36, H.J. Lu wrote:
> > On Fri, Mar 25, 2022 at 7:28 AM Jan Beulich <jbeulich@suse.com> wrote:
> >>
> >> On 25.03.2022 15:22, H.J. Lu wrote:
> >>> On Fri, Mar 25, 2022 at 1:21 AM Jan Beulich <jbeulich@suse.com> wrote:
> >>>>
> >>>> On 24.03.2022 20:23, H.J. Lu wrote:
> >>>>> Remove bfd_arch_l1om and bfd_arch_k1om since L1OM/K1OM support has been
> >>>>> removed from gas, ld and opcodes.
> >>>>
> >>>> As said in a post-commit-message comment of the patch removing support
> >>>> from ld/, I'd prefer to keep e.g. elfedit functioning for these targets.
> >>>
> >>> elfedit doesn't need bfd_arch_l1om nor bfd_arch_k1om.
> >>
> >> Oh, okay. (I didn't check how it actually works internally.)
> >>
> >>>> Maybe not necessarily for the input, but at least for the output. Else
> >>>> there's no way for people to create such objects anymore, forcing them
> >>>> to resort to hex-editing of files, which I view as undesirable. I think
> >>>> this 2nd patch goes against that; I'm not sure in how far the 1st one
> >>>> would still allow this to function.
> >>>
> >>> People can use the older binutils.
> >>
> >> Hmm, well, yes, that's possible, but not very nice. But according to
> >> your reply further up I take it that it'll continue to function anyway?
> >
> > We have removed L1OM/K1OM support from ld, gas and objdump.
> > What else do we support L1OM/K1OM?
>
> I'm afraid I don't understand the question.
>

What user visible L1OM/K1OM support do my patches remove? Are there any
testcases for such support?

-- 
H.J.

Re: [PATCH 2/2] bfd: Remove bfd_arch_l1om and bfd_arch_k1om

[Jan Beulich]

On 25.03.2022 18:15, H.J. Lu wrote:
> On Fri, Mar 25, 2022 at 8:26 AM Jan Beulich <jbeulich@suse.com> wrote:
>>
>> On 25.03.2022 15:36, H.J. Lu wrote:
>>> On Fri, Mar 25, 2022 at 7:28 AM Jan Beulich <jbeulich@suse.com> wrote:
>>>>
>>>> On 25.03.2022 15:22, H.J. Lu wrote:
>>>>> On Fri, Mar 25, 2022 at 1:21 AM Jan Beulich <jbeulich@suse.com> wrote:
>>>>>>
>>>>>> On 24.03.2022 20:23, H.J. Lu wrote:
>>>>>>> Remove bfd_arch_l1om and bfd_arch_k1om since L1OM/K1OM support has been
>>>>>>> removed from gas, ld and opcodes.
>>>>>>
>>>>>> As said in a post-commit-message comment of the patch removing support
>>>>>> from ld/, I'd prefer to keep e.g. elfedit functioning for these targets.
>>>>>
>>>>> elfedit doesn't need bfd_arch_l1om nor bfd_arch_k1om.
>>>>
>>>> Oh, okay. (I didn't check how it actually works internally.)
>>>>
>>>>>> Maybe not necessarily for the input, but at least for the output. Else
>>>>>> there's no way for people to create such objects anymore, forcing them
>>>>>> to resort to hex-editing of files, which I view as undesirable. I think
>>>>>> this 2nd patch goes against that; I'm not sure in how far the 1st one
>>>>>> would still allow this to function.
>>>>>
>>>>> People can use the older binutils.
>>>>
>>>> Hmm, well, yes, that's possible, but not very nice. But according to
>>>> your reply further up I take it that it'll continue to function anyway?
>>>
>>> We have removed L1OM/K1OM support from ld, gas and objdump.
>>> What else do we support L1OM/K1OM?
>>
>> I'm afraid I don't understand the question.
>>
> 
> What user visible L1OM/K1OM support do my patches remove?

I didn't claim they do; I merely asked that they please wouldn't. Being
part of binutils, which nowadays is almost completely bfd-based, I think
it is a natural assumption that elfedit would also use libbfd. Looks like
it doesn't (at least not in ways affecting what machine types it is able
to deal with), but being able to tell required closer looking at the code.

> Are there any testcases for such support?

I wasn't aware of any, but looking at binutils/testsuite/ I find there
actually are a few. So if those continue to pass, all should be fine
afaic.

Jan

Re: [PATCH 2/2] bfd: Remove bfd_arch_l1om and bfd_arch_k1om

[H.J. Lu]

On Mon, Mar 28, 2022 at 1:34 AM Jan Beulich <jbeulich@suse.com> wrote:
>
> On 25.03.2022 18:15, H.J. Lu wrote:
> > On Fri, Mar 25, 2022 at 8:26 AM Jan Beulich <jbeulich@suse.com> wrote:
> >>
> >> On 25.03.2022 15:36, H.J. Lu wrote:
> >>> On Fri, Mar 25, 2022 at 7:28 AM Jan Beulich <jbeulich@suse.com> wrote:
> >>>>
> >>>> On 25.03.2022 15:22, H.J. Lu wrote:
> >>>>> On Fri, Mar 25, 2022 at 1:21 AM Jan Beulich <jbeulich@suse.com> wrote:
> >>>>>>
> >>>>>> On 24.03.2022 20:23, H.J. Lu wrote:
> >>>>>>> Remove bfd_arch_l1om and bfd_arch_k1om since L1OM/K1OM support has been
> >>>>>>> removed from gas, ld and opcodes.
> >>>>>>
> >>>>>> As said in a post-commit-message comment of the patch removing support
> >>>>>> from ld/, I'd prefer to keep e.g. elfedit functioning for these targets.
> >>>>>
> >>>>> elfedit doesn't need bfd_arch_l1om nor bfd_arch_k1om.
> >>>>
> >>>> Oh, okay. (I didn't check how it actually works internally.)
> >>>>
> >>>>>> Maybe not necessarily for the input, but at least for the output. Else
> >>>>>> there's no way for people to create such objects anymore, forcing them
> >>>>>> to resort to hex-editing of files, which I view as undesirable. I think
> >>>>>> this 2nd patch goes against that; I'm not sure in how far the 1st one
> >>>>>> would still allow this to function.
> >>>>>
> >>>>> People can use the older binutils.
> >>>>
> >>>> Hmm, well, yes, that's possible, but not very nice. But according to
> >>>> your reply further up I take it that it'll continue to function anyway?
> >>>
> >>> We have removed L1OM/K1OM support from ld, gas and objdump.
> >>> What else do we support L1OM/K1OM?
> >>
> >> I'm afraid I don't understand the question.
> >>
> >
> > What user visible L1OM/K1OM support do my patches remove?
>
> I didn't claim they do; I merely asked that they please wouldn't. Being
> part of binutils, which nowadays is almost completely bfd-based, I think
> it is a natural assumption that elfedit would also use libbfd. Looks like
> it doesn't (at least not in ways affecting what machine types it is able
> to deal with), but being able to tell required closer looking at the code.
>
> > Are there any testcases for such support?
>
> I wasn't aware of any, but looking at binutils/testsuite/ I find there
> actually are a few. So if those continue to pass, all should be fine
> afaic.
>

I am checking in my patches.

-- 
H.J.