-.#define bfd_mach_mips_xlr 887682 {* decimal 'XLR' *}
-.#define bfd_mach_mipsisa32 32
-.#define bfd_mach_mipsisa32r2 33
-.#define bfd_mach_mipsisa64 64
-.#define bfd_mach_mipsisa64r2 65
-. bfd_arch_i386, {* Intel 386 *}
-.#define bfd_mach_i386_i386 1
-.#define bfd_mach_i386_i8086 2
-.#define bfd_mach_i386_i386_intel_syntax 3
-.#define bfd_mach_x64_32 32
-.#define bfd_mach_x64_32_intel_syntax 33
-.#define bfd_mach_x86_64 64
-.#define bfd_mach_x86_64_intel_syntax 65
-. bfd_arch_l1om, {* Intel L1OM *}
-.#define bfd_mach_l1om 66
-.#define bfd_mach_l1om_intel_syntax 67
-. bfd_arch_we32k, {* AT&T WE32xxx *}
-. bfd_arch_tahoe, {* CCI/Harris Tahoe *}
-. bfd_arch_i860, {* Intel 860 *}
-. bfd_arch_i370, {* IBM 360/370 Mainframes *}
-. bfd_arch_romp, {* IBM ROMP PC/RT *}
-. bfd_arch_convex, {* Convex *}
-. bfd_arch_m88k, {* Motorola 88xxx *}
-. bfd_arch_m98k, {* Motorola 98xxx *}
-. bfd_arch_pyramid, {* Pyramid Technology *}
-. bfd_arch_h8300, {* Renesas H8/300 (formerly Hitachi H8/300) *}
-.#define bfd_mach_h8300 1
-.#define bfd_mach_h8300h 2
-.#define bfd_mach_h8300s 3
-.#define bfd_mach_h8300hn 4
-.#define bfd_mach_h8300sn 5
-.#define bfd_mach_h8300sx 6
-.#define bfd_mach_h8300sxn 7
-. bfd_arch_pdp11, {* DEC PDP-11 *}
-. bfd_arch_plugin,
-. bfd_arch_powerpc, {* PowerPC *}
+.#define bfd_mach_mips_octeonp 6601
+.#define bfd_mach_mips_octeon2 6502
+.#define bfd_mach_mips_octeon3 6503
+.#define bfd_mach_mips_xlr 887682 {* decimal 'XLR'. *}
+.#define bfd_mach_mips_interaptiv_mr2 736550 {* decimal 'IA2'. *}
+.#define bfd_mach_mipsisa32 32
+.#define bfd_mach_mipsisa32r2 33
+.#define bfd_mach_mipsisa32r3 34
+.#define bfd_mach_mipsisa32r5 36
+.#define bfd_mach_mipsisa32r6 37
+.#define bfd_mach_mipsisa64 64
+.#define bfd_mach_mipsisa64r2 65
+.#define bfd_mach_mipsisa64r3 66
+.#define bfd_mach_mipsisa64r5 68
+.#define bfd_mach_mipsisa64r6 69
+.#define bfd_mach_mips_micromips 96
+. bfd_arch_i386, {* Intel 386. *}
+.#define bfd_mach_i386_intel_syntax (1 << 0)
+.#define bfd_mach_i386_i8086 (1 << 1)
+.#define bfd_mach_i386_i386 (1 << 2)
+.#define bfd_mach_x86_64 (1 << 3)
+.#define bfd_mach_x64_32 (1 << 4)
+.#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)
+.#define bfd_mach_i386_nacl (1 << 7)
+.#define bfd_mach_i386_i386_nacl (bfd_mach_i386_i386 | bfd_mach_i386_nacl)
+.#define bfd_mach_x86_64_nacl (bfd_mach_x86_64 | bfd_mach_i386_nacl)
+.#define bfd_mach_x64_32_nacl (bfd_mach_x64_32 | bfd_mach_i386_nacl)
+. bfd_arch_iamcu, {* Intel MCU. *}
+.#define bfd_mach_iamcu (1 << 8)
+.#define bfd_mach_i386_iamcu (bfd_mach_i386_i386 | bfd_mach_iamcu)
+.#define bfd_mach_i386_iamcu_intel_syntax (bfd_mach_i386_iamcu | bfd_mach_i386_intel_syntax)
+. bfd_arch_romp, {* IBM ROMP PC/RT. *}
+. bfd_arch_convex, {* Convex. *}
+. bfd_arch_m98k, {* Motorola 98xxx. *}
+. bfd_arch_pyramid, {* Pyramid Technology. *}
+. bfd_arch_h8300, {* Renesas H8/300 (formerly Hitachi H8/300). *}
+.#define bfd_mach_h8300 1
+.#define bfd_mach_h8300h 2
+.#define bfd_mach_h8300s 3
+.#define bfd_mach_h8300hn 4
+.#define bfd_mach_h8300sn 5
+.#define bfd_mach_h8300sx 6
+.#define bfd_mach_h8300sxn 7
+. bfd_arch_pdp11, {* DEC PDP-11. *}
+. bfd_arch_powerpc, {* PowerPC. *}