Remove /usr/ccs references on Solaris

/usr/ccs/bin has been replaced by a symlink to /usr/bin since at least
Solaris 11.3, so there's no reason to use that path any longer.

This patch removes all references to it.

Tested on i386-pc-solaris2.11.

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

	* configure.ac (md_exec_prefix): Don't set on Solaris.
	* configure: Regenerate.

	contrib:
	* make_sunver.pl ($elfdump): Remove ccs from path.

	gcc:
	* config/sol2.h (MD_EXEC_PREFIX): Remove.

	libstdc++-v3:
	* scripts/extract_symvers.pl: Remove ccs from elfdump path.

diff --git a/configure b/configure
index 2551fe0275280243948a73943527322e531c2b08..d4da79e766908440e919c3a43b1a8a75bf3b6d17 100755 (executable)
--- a/configure
+++ b/configure
@@ -10865,8 +10865,7 @@ case "${target}" in
     md_exec_prefix=/dev/env/DJDIR/bin
     ;;
   *-*-hpux* | \
-  *-*-nto-qnx* | \
-  *-*-solaris2*)
+  *-*-nto-qnx*)
     md_exec_prefix=/usr/ccs/bin
     ;;
 esac

diff --git a/configure.ac b/configure.ac
index 94321ffd20ab3ab67575cbb948d696572cb90260..456a673b9bbec4903092a95189dad95d01462d58 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3049,8 +3049,7 @@ case "${target}" in
     md_exec_prefix=/dev/env/DJDIR/bin
     ;;
   *-*-hpux* | \
-  *-*-nto-qnx* | \
-  *-*-solaris2*)
+  *-*-nto-qnx*)
     md_exec_prefix=/usr/ccs/bin
     ;;
 esac

diff --git a/contrib/make_sunver.pl b/contrib/make_sunver.pl
index 4dd184d64ea13237cbbafce2b1ca1dc0dcd8c15c..1d6980b61a9961abc53e63b5f5c9a75c46706783 100644 (file)
--- a/contrib/make_sunver.pl
+++ b/contrib/make_sunver.pl
@@ -66,7 +66,7 @@ foreach $file (@ARGV) {
 # columns.
 
 # The path to elfdump.
-my $elfdump = "/usr/ccs/bin/elfdump";
+my $elfdump = "/usr/bin/elfdump";
 
 if (-f $elfdump) {
     open ELFDUMP,$elfdump.' -s '.(join ' ',@OBJECTS).'|' or die $!;

diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h
index 2f5ead99a3615f2d6b51512efe5a592a51c977bd..15ab5d0c455ce03e6ef4dcdd803d922fa8c7d2d8 100644 (file)
--- a/gcc/config/sol2.h
+++ b/gcc/config/sol2.h
@@ -158,11 +158,6 @@ along with GCC; see the file COPYING3.  If not see
   "%{!symbolic:\
      %{p|pg:-ldl} -lc}"
 
-#ifndef CROSS_DIRECTORY_STRUCTURE
-#undef MD_EXEC_PREFIX
-#define MD_EXEC_PREFIX "/usr/ccs/bin/"
-#endif
-
 /* Enable constructor priorities if the configured linker supports it.  */
 #undef SUPPORTS_INIT_PRIORITY
 #define SUPPORTS_INIT_PRIORITY HAVE_INITFINI_ARRAY_SUPPORT

diff --git a/libstdc++-v3/scripts/extract_symvers.pl b/libstdc++-v3/scripts/extract_symvers.pl
index fb18e11a1b3ef5caa159193c7ea0a2b1caf353c9..dcfbd68a697fd3341cea9d6d273df5bdbe6d87ab 100644 (file)
--- a/libstdc++-v3/scripts/extract_symvers.pl
+++ b/libstdc++-v3/scripts/extract_symvers.pl
@@ -95,7 +95,7 @@ close PVS or die "pvs error";
 # Ignore error output to avoid getting confused by
 # .gnu.version_r: zero sh_entsize information, expected 0x1
 # warning with Solaris 11 elfdump on gld-produced shared objects.
-open ELFDUMP, "/usr/ccs/bin/elfdump -s -N .dynsym $lib 2>/dev/null |" or die $!;
+open ELFDUMP, "/usr/bin/elfdump -s -N .dynsym $lib 2>/dev/null |" or die $!;
 while (<ELFDUMP>) {
     chomp;