bfd/x86: minor re-work of Solaris targ*_selvec

targ64_selvec is useful as a separate enumeration from targ_selvec only
when want64 isn't set to true.

diff --git a/bfd/config.bfd b/bfd/config.bfd
index 3e57676327c245f89eae0fb1d73a05f1a3bf5e30..bc035a078bc469d5b9b5464f385db3d067a41275 100644 (file)
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -584,9 +584,8 @@ case "${targ}" in
     ;;
   i[3-7]86-*-solaris2*)
     targ_defvec=i386_elf32_sol2_vec
-    targ_selvecs=i386_elf32_vec
-    targ64_selvecs="x86_64_elf64_sol2_vec x86_64_elf64_vec"
     # Include 64-bit support to match GCC.
+    targ_selvecs="i386_elf32_vec x86_64_elf64_sol2_vec x86_64_elf64_vec"
     want64=true
     ;;
   i[3-7]86-*-solaris*)
@@ -1176,7 +1175,7 @@ case "${targ}" in
 
   s390-*-linux*)
     targ_defvec=s390_elf32_vec
-    targ64_selvecs=s390_elf64_vec
+    targ_selvecs=s390_elf64_vec
     want64=true
     ;;
 #ifdef BFD64
@@ -1263,9 +1262,8 @@ case "${targ}" in
     ;;
   sparc-*-solaris2*)
     targ_defvec=sparc_elf32_sol2_vec
-    targ_selvecs=sparc_elf32_vec
-    targ64_selvecs="sparc_elf64_sol2_vec sparc_elf64_vec"
     # Include 64-bit support to match GCC.
+    targ_selvecs="sparc_elf32_vec sparc_elf64_sol2_vec sparc_elf64_vec"
     want64=true
     ;;
 #ifdef BFD64