https://gcc.gnu.org/g:d9a19e68057d2e344e58800363dceb98b8f5a792
commit r16-5318-gd9a19e68057d2e344e58800363dceb98b8f5a792 Author: Rainer Orth <[email protected]> Date: Sun Nov 16 14:00:11 2025 +0100 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 <[email protected]> * 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: --- configure | 3 +-- configure.ac | 3 +-- contrib/make_sunver.pl | 2 +- gcc/config/sol2.h | 5 ----- libstdc++-v3/scripts/extract_symvers.pl | 2 +- 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 2551fe027528..d4da79e76690 100755 --- 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 94321ffd20ab..456a673b9bbe 100644 --- 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 4dd184d64ea1..1d6980b61a99 100644 --- 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 2f5ead99a361..15ab5d0c455c 100644 --- 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 fb18e11a1b3e..dcfbd68a697f 100644 --- 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;
