more solaris tidies

Don't overspecify the obsolete solaris targets: match solaris* rather
than solaris2.[0-9]*.  Move the sparc-*-solaris2.[0-6]* match later,
and make it sparc*-*-solaris* so that it catches sparcv9 and sparc64.
This change is necessary for internal binutils consistency so that
selecting --target=sparc-sun-solaris2 gets an error that the target is
obsolete, and furthermore that the same target with --enable-obsolete
does not result in runtime errors.

bfd/
	* config.bfd: Don't overspecify obsolete solaris targets.
ld/
	* configure.tgt: Don't overspecify obsolete solaris targets.
	* po/BLD-POTFILES.in: Regenerate.

diff --git a/bfd/config.bfd b/bfd/config.bfd
index a9f5f457f45db937ed97fbf1dd9a60b5355a3153..b180382d7f4a0d5837cd90bcbf3c7a5e86221322 100644 (file)
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -51,7 +51,7 @@ case $targ in
  *-*-solaris2.1[01]*)
     # Only Solaris 10+ is not obsolete.
     ;;
- *-*-solaris2.[0-9]* | \
+ *-*-solaris* | \
  null)
     if test "x$enable_obsolete" != xyes; then
       echo "*** Configuration $targ is obsolete." >&2
@@ -600,7 +600,7 @@ case "${targ}" in
     targ64_selvecs=x86_64_elf64_sol2_vec
     want64=true
     ;;
-  i[3-7]86-*-solaris2.[0-9]*)
+  i[3-7]86-*-solaris*)
     # PR 27666: Do not include i386_elf32_vec here.
     targ_defvec=i386_elf32_sol2_vec
     ;;
@@ -1341,10 +1341,6 @@ case "${targ}" in
     targ64_selvecs=sparc_elf64_sol2_vec
     want64=true
     ;;
-  sparc-*-solaris2.[0-6]*)
-    # PR 27666: Do not include sparc_elf32_vec here.
-    targ_defvec=sparc_elf32_sol2_vec
-    ;;
 #ifdef BFD64
   sparcv9-*-solaris2.[7-9]* | sparcv9-*-solaris2.1[01]* | \
   sparc64-*-solaris2.[7-9]* | sparc64-*-solaris2.1[01]*)
@@ -1376,6 +1372,10 @@ case "${targ}" in
     targ_defvec=sparc_elf32_vxworks_vec
     targ_selvecs="sparc_elf32_vec"
     ;;
+  sparc*-*-solaris*)
+    # PR 27666: Do not include sparc_elf32_vec here.
+    targ_defvec=sparc_elf32_sol2_vec
+    ;;
   sparc*-*-*)
     targ_defvec=sparc_elf32_vec
     ;;

diff --git a/ld/configure.tgt b/ld/configure.tgt
index 31fa2d8aded95dcbe9ccd8752118fbfd42b9acbb..abc94f8df3991fb1e864ae181c3ab9f07260e9a1 100644 (file)
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -378,7 +378,7 @@ i[3-7]86-*-solaris2.1[01]*)
                        targ_extra_emuls="elf_x86_64_sol2 elf_i386 elf_x86_64"
                        targ_extra_libpath=$targ_extra_emuls
                        ;;
-i[3-7]86-*-solaris2.[0-9]*)
+i[3-7]86-*-solaris*)
                        targ_emul=elf_i386_sol2
                        targ_extra_emuls=elf_i386
                        targ_extra_libpath=$targ_extra_emuls
@@ -938,7 +938,7 @@ sparc-*-solaris2.[7-9]* | sparc-*-solaris2.1[01]*)
                        targ_extra_emuls="elf64_sparc_sol2 elf32_sparc elf64_sparc"
                        targ_extra_libpath=$targ_extra_emuls
                        ;;
-sparc-*-solaris2.[0-6]*)
+sparc*-*-solaris*)
                        targ_emul=elf32_sparc_sol2
                        targ_extra_emuls=elf32_sparc
                        ;;

diff --git a/ld/po/BLD-POTFILES.in b/ld/po/BLD-POTFILES.in
index 94bd7b0d2a816da65e7470da2692974827bf42fe..d7d0c517307e3c603d1b807c9f73c2e91a450c5c 100644 (file)
--- a/ld/po/BLD-POTFILES.in
+++ b/ld/po/BLD-POTFILES.in
@@ -204,7 +204,6 @@ eelf_i386.c
 eelf_i386_be.c
 eelf_i386_fbsd.c
 eelf_i386_haiku.c
-eelf_i386_ldso.c
 eelf_i386_sol2.c
 eelf_i386_vxworks.c
 eelf_iamcu.c