From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Thu, 11 Dec 2025 14:02:37 +0000 (+0100)
Subject: Cleanup bfd target vectors and ld emulations on Solaris (missed part)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38fc3ca9fe4fc2f51beb4d1bced28575f01d9dfb;p=thirdparty%2Fbinutils-gdb.git

Cleanup bfd target vectors and ld emulations on Solaris (missed part)

This reordering of the x86_64-*-solaris2.1[01] entry in config.bfd was
missed in the original commit.

2025-09-09  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	bfd:
	* config.bfd [BFD64] <x86_64-*-solaris2.1[01]*>: Move down.
---

diff --git a/bfd/config.bfd b/bfd/config.bfd
index bf6ea9f71e0..a9f5f457f45 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -604,14 +604,6 @@ case "${targ}" in
     # PR 27666: Do not include i386_elf32_vec here.
     targ_defvec=i386_elf32_sol2_vec
     ;;
-#ifdef BFD64
-  x86_64-*-solaris2.1[01]*)
-    # PR 27666: Do not include i386_elf32_vec or x86_64_elf64_vec.
-    targ_defvec=x86_64_elf64_sol2_vec
-    targ_selvecs=i386_elf32_sol2_vec
-    want64=true
-    ;;
-#endif
   i[3-7]86-*-nto*)
     targ_defvec=i386_elf32_vec
     targ_selvecs="iamcu_elf32_vec i386_coff_vec"
@@ -734,6 +726,12 @@ case "${targ}" in
     targ_selvecs=i386_elf32_vec
     want64=true
     ;;
+  x86_64-*-solaris2.1[01]*)
+    # PR 27666: Do not include i386_elf32_vec or x86_64_elf64_vec.
+    targ_defvec=x86_64_elf64_sol2_vec
+    targ_selvecs=i386_elf32_sol2_vec
+    want64=true
+    ;;
   x86_64-*-gnu*)
     targ_defvec=x86_64_elf64_vec
     targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec"