2003-09-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* base-g77.add, base-gcc.add, base-gcj.add, base-gnat.add,
	target-c++.add, target-g77.add, target-gcc.add, target-gcj.add,
	target-gnat.add, target-objc.add
	Add support for %{rpmprefix}, %{rpmgroup}.
	Use %{gcc_target and %{gcc_version}.
	Remove "Provides:".
	* gccnewlib.add: Ditto.
	Correct setting up _gcj.
	Explicitly build c++filt for gcc >= 3.3.
	* mkspec.in: Add support for %{rpmprefix}, %{rpmgroup}.

13 files changed, 180 insertions, 147 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 8ff9fc285f..5ac4c92346 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,5 +1,18 @@
 2003-09-02	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
+	* base-g77.add, base-gcc.add, base-gcj.add, base-gnat.add,
+	target-c++.add, target-g77.add, target-gcc.add, target-gcj.add,
+	target-gnat.add, target-objc.add
+	Add support for %{rpmprefix}, %{rpmgroup}.
+	Use %{gcc_target and %{gcc_version}.
+	Remove "Provides:".
+	* gccnewlib.add: Ditto.
+	Correct setting up _gcj.
+	Explicitly build c++filt for gcc >= 3.3.
+	* mkspec.in: Add support for %{rpmprefix}, %{rpmgroup}.
+
+2003-09-02	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
 	* binutils/Makefile.am: Minor cleanups.
 	* binutils/binutils.add, binutils/base-binutils.add,
 	binutils/target-binutils.add: Add support for %{rpmprefix}, 
diff --git a/scripts/gcc3newlib/base-g77.add b/scripts/gcc3newlib/base-g77.add
index b2495f4b2c..06f96e8e61 100644
--- a/scripts/gcc3newlib/base-g77.add
+++ b/scripts/gcc3newlib/base-g77.add
@@ -2,27 +2,26 @@
 # ==============================================================
 # rtems-base-g77
 # ==============================================================
-%package -n rtems-base-g77
-Provides:	rtems-base-g77
+%package -n %{rpmprefix}rtems-base-g77
 Summary:      rtems base package for gcc/g77 compiler
-Group: rtems
+Group: %{rpmgroup}
 Requires: rtems-base-gcc
 
-%description -n rtems-base-g77
+%description -n %{rpmprefix}rtems-base-g77
 RTEMS is an open source operating system for embedded systems.
 
 This is the files for gcc/g77 that are shared by all targets.
 
-%files -n rtems-base-g77
+%files -n %{rpmprefix}rtems-base-g77
 %defattr(-,root,root)
 %dir %{_prefix}/info
 %doc %{_prefix}/info/g77.info*.gz
 
 %dir %{_prefix}/man
 %dir %{_prefix}/man/man1
-%doc %{_prefix}/man/man1/@target_alias@-g77.1*
+%doc %{_prefix}/man/man1/%{gcc_target}-g77.1*
 
-%post -n rtems-base-g77
+%post -n %{rpmprefix}rtems-base-g77
   if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
   then
     rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
@@ -32,7 +31,7 @@ This is the files for gcc/g77 that are shared by all targets.
     done
   fi
 
-%postun -n rtems-base-g77
+%postun -n %{rpmprefix}rtems-base-g77
   if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
   then
     rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
diff --git a/scripts/gcc3newlib/base-gcc.add b/scripts/gcc3newlib/base-gcc.add
index f719e8f5cc..f628b8d50c 100644
--- a/scripts/gcc3newlib/base-gcc.add
+++ b/scripts/gcc3newlib/base-gcc.add
@@ -1,18 +1,17 @@
 # ==============================================================
-# rtems-base-gcc
+# %{rpmprefix}rtems-base-gcc
 # ==============================================================
-%package -n rtems-base-gcc
-Provides:	rtems-base-gcc
+%package -n %{rpmprefix}rtems-base-gcc
 Summary:      	base package for rtems gcc and newlib C Library 
-Group: rtems
+Group: %{rpmgroup}
 
-%description -n rtems-base-gcc
+%description -n %{rpmprefix}rtems-base-gcc
 
 RTEMS is an open source operating system for embedded systems.
 
 This is the files for gcc and newlib that are shared by all targets.
 
-%files -n rtems-base-gcc
+%files -n %{rpmprefix}rtems-base-gcc
 %defattr(-,root,root)
 %dir %{_prefix}/info
 %doc %{_prefix}/info/cpp.info*.gz
@@ -33,7 +32,7 @@ This is the files for gcc and newlib that are shared by all targets.
 
 %dir %{_prefix}/include
 
-%post -n rtems-base-gcc
+%post -n %{rpmprefix}rtems-base-gcc
   if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
   then
     rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
@@ -43,7 +42,7 @@ This is the files for gcc and newlib that are shared by all targets.
     done
   fi
 
-%postun -n rtems-base-gcc
+%postun -n %{rpmprefix}rtems-base-gcc
   if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
   then
     rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
diff --git a/scripts/gcc3newlib/base-gcj.add b/scripts/gcc3newlib/base-gcj.add
index ef0ecb9778..93d4f9f25d 100644
--- a/scripts/gcc3newlib/base-gcj.add
+++ b/scripts/gcc3newlib/base-gcj.add
@@ -2,18 +2,17 @@
 # ==============================================================
 # rtems-base-gcj
 # ==============================================================
-%package -n rtems-base-gcj
-Provides:	rtems-base-gcj
+%package -n %{rpmprefix}rtems-base-gcj
 Summary:      base package for rtems gcc/java compiler (gcj).
-Group: rtems
-Requires: rtems-base-gcc
+Group: %{rpmgroup}
+Requires: %{rpmprefix}rtems-base-gcc
 
-%description -n rtems-base-gcj
+%description -n %{rpmprefix}rtems-base-gcj
 RTEMS is an open source operating system for embedded systems.
 
 This is the files for gcc/java (gcj) that are shared by all targets.
 
-%files -n rtems-base-gcj
+%files -n %{rpmprefix}rtems-base-gcj
 %defattr(-,root,root)
 %dir %{_prefix}/bin
 %{_prefix}/bin/jar%{_exeext}
diff --git a/scripts/gcc3newlib/base-gnat.add b/scripts/gcc3newlib/base-gnat.add
index 648e764c5e..451994596a 100644
--- a/scripts/gcc3newlib/base-gnat.add
+++ b/scripts/gcc3newlib/base-gnat.add
@@ -2,17 +2,16 @@
 # ==============================================================
 # rtems-base-gnat
 # ==============================================================
-%package -n rtems-base-gnat
-Provides:	rtems-base-gnat
+%package -n %{rpmprefix}rtems-base-gnat
 Summary:	gcc/gnat tools
-Group: rtems
+Group: %{rpmgroup}
 
-%description -n rtems-base-gnat
+%description -n %{rpmprefix}rtems-base-gnat
 RTEMS is an open source operating system for embedded systems.
 
 This is the gcc/gnat tools for the gcc/gnat compiler
 
-%files -n rtems-base-gnat
+%files -n %{rpmprefix}rtems-base-gnat
 %defattr(-,root,root)
 %dir %{_prefix}/bin
 # %{_prefix}/bin/gnat*
diff --git a/scripts/gcc3newlib/gccnewlib.add b/scripts/gcc3newlib/gccnewlib.add
index 18426b3e81..66a77139ba 100644
--- a/scripts/gcc3newlib/gccnewlib.add
+++ b/scripts/gcc3newlib/gccnewlib.add
@@ -2,9 +2,11 @@
 %define gcc_version	@gcc_version@
 %define newlib_version	@newlib_version@
 
-Name:         @target_alias@-gcc-newlib
-Summary:      gcc and newlib C Library for @target_alias@.
-Group:	      rtems
+%define gcc_target	@target_alias@
+
+Name:         %{rpmprefix}%{gcc_target}-gcc-newlib
+Summary:      gcc and newlib C Library for %{gcc_target}.
+Group: %{rpmgroup}
 Release:      @Release@
 License:      gcc is GPL/LGPL ; newlib no has restrictions on run-time usage
 
@@ -12,16 +14,20 @@ Autoreqprov:  	on
 Packager:     	corsepiu@faw.uni-ulm.de and joel@OARcorp.com
 
 Version:      	gcc%{gcc_version}newlib%{newlib_version}
-# gcc 3.x and gcc 2.9
-# Source0:      ftp://ftp.gnu.org/pub/gnu/gcc/gcc-@gcc_version@.tar.gz
-Source0:      ftp://ftp.gnu.org/pub/gnu/gcc/gcc-@gcc_version@.tar.bz2
-# gcc 2.95.x
-# Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}.tar.bz2
+%if "%{gcc_version}" >= "3.2.2"
+Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}/gcc-%{gcc_version}.tar.bz2
+%else
+%if "%{gcc_version}" >= "3.0"
+Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}/gcc-%{gcc_version}.tar.gz
+%else
+Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}/gcc-%{gcc_version}-everything.tar.gz
+%endif
+%endif
 Source1:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz
 @PATCH1@
 @PATCH3@
 BuildPreReq:	texinfo >= 4.2
-BuildPreReq:	@target_alias@-binutils
+BuildPreReq:	%{rpmprefix}%{gcc_target}-binutils
 #
 # The original sources are not included in the source RPM.
 # If we included them, then the source RPMs for each target
@@ -55,7 +61,7 @@ NoSource:	1
 %define _gcj	%{?gcj:%gcj}%{!?gcj:1}
 %else
 # default to not building gcj
-%define _gcj	%{?gnat:%gcj}%{!?gcj:0}
+%define _gcj	%{?gcj:%gcj}%{!?gcj:0}
 %endif
 
 
@@ -65,38 +71,38 @@ NoSource:	1
 %define build_gcj	0
 %define build_gnat	0
 
-%if "@target_alias@" == "arm-rtems"
+%if "%{gcc_target}" == "arm-rtems"
 %define build_gcj	%_gcj
 %endif
 
-%if "@target_alias@" == "c4x-rtems"
+%if "%{gcc_target}" == "c4x-rtems"
 %define build_cxx	0
 %endif
 
-%if "@target_alias@" == "i386-rtems"
+%if "%{gcc_target}" == "i386-rtems"
 %define build_gnat      %_gnat
 %define build_gcj	%_gcj
 %endif
 
-%if "@target_alias@" == "i960-rtems"
+%if "%{gcc_target}" == "i960-rtems"
 %define build_cxx	0
 %endif
 
-%if "@target_alias@" == "m68k-rtems"
+%if "%{gcc_target}" == "m68k-rtems"
 %define build_gcj	%_gcj
 %endif
 
-%if "@target_alias@" == "mips-rtems"
+%if "%{gcc_target}" == "mips-rtems"
 %define build_gnat      %_gnat
 %define build_gcj	%_gcj
 %endif
 
-%if "@target_alias@" == "powerpc-rtems"
+%if "%{gcc_target}" == "powerpc-rtems"
 %define build_gnat      %_gnat
 %define build_gcj	%_gcj
 %endif
 
-%if "@target_alias@" == "sparc-rtems"
+%if "%{gcc_target}" == "sparc-rtems"
 %define build_gnat      %_gnat
 %define build_gcj	%_gcj
 %endif
@@ -133,7 +139,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
  Or you can try the ftp options of rpm :-)
 
 %prep
-# untar the sources inside @target_alias@-gcc-newlib
+# untar the sources inside %{gcc_target}-gcc-newlib
 %setup -c -T -n %{name} -a0 -a1
 
 @PATCH2@
@@ -175,9 +181,11 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
 %if %build_gnat
   languages="$languages,ada"
 %endif
+
+  export PATH="%{_bindir}:${PATH}"
   ../gcc-%{gcc_version}/configure \
     --build=%_build --host=%_host \
-    --target=@target_alias@ \
+    --target=%{gcc_target} \
     --with-gnu-as --with-gnu-ld --with-newlib --verbose \
     --with-system-zlib --disable-nls \
     --enable-version-specific-runtime-libs \
@@ -191,6 +199,12 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
   cp ../gcc-%{gcc_version}/gcc/gsyslimits.h gcc/include/syslimits.h
 %endif
 
+%if %build_cxx
+%if "%{gcc_version}" >= "3.3"
+  make -C %{gcc_target}/libiberty CFLAGS="$RPM_OPT_FLAGS" c++filt
+%endif
+%endif
+
 %if %build_gnat
   cd ../gcc-%{gcc_version}/gcc/ada
   touch treeprs.ads [es]info.h nmake.ad[bs]
@@ -212,11 +226,11 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
 # but what we override below
   GNATLIBCFLAGS="-g -O2"
 # Let gnatlib building find newlib's headers
-  GNATLIBCFLAGS="$GNATLIBCFLAGS -isystem `pwd`/@target_alias@/newlib/targ-include"
+  GNATLIBCFLAGS="$GNATLIBCFLAGS -isystem `pwd`/%{gcc_target}/newlib/targ-include"
   GNATLIBCFLAGS="$GNATLIBCFLAGS -isystem `pwd`/../newlib-%{newlib_version}/newlib/libc/include"
 # Without this xgcc doesn't find the target's binutils.
-  GNATLIBCFLAGS="$GNATLIBCFLAGS -B%{_prefix}/@target_alias@/bin/"
-%if "@target_alias@" == "mips-rtems"
+  GNATLIBCFLAGS="$GNATLIBCFLAGS -B%{_prefix}/%{gcc_target}/bin/"
+%if "%{gcc_target}" == "mips-rtems"
   GNATLIBCFLAGS="$GNATLIBCFLAGS -G0"
 %endif
   make -C gcc GNATLIBCFLAGS="${GNATLIBCFLAGS}" gnatlib
@@ -224,17 +238,18 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
   make info
 
 %install
+  export PATH="%{_bindir}:${PATH}"
   cd build
 # Bug in gcc-2.95.1: It doesn't build this installation directory
-# If it doesn't find it, gcc doesn't install @target_alias@/bin/gcc
+# If it doesn't find it, gcc doesn't install %{gcc_target}/bin/gcc
 %if "%{gcc_version}" < "3.0"
   ../gcc-%{gcc_version}/mkinstalldirs \
-    $RPM_BUILD_ROOT%{_prefix}/@target_alias@/bin
+    $RPM_BUILD_ROOT%{_prefix}/%{gcc_target}/bin
 %endif
 
   make prefix=$RPM_BUILD_ROOT%{_prefix} \
     bindir=$RPM_BUILD_ROOT%{_bindir} install
-  cd @target_alias@/newlib
+  cd %{gcc_target}/newlib
   make prefix=$RPM_BUILD_ROOT%{_prefix} \
     bindir=$RPM_BUILD_ROOT%{_bindir} install-info
   # cd back to build/
@@ -243,9 +258,9 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
 %if %build_gnat
 # Install a copy of gcc as gnatgcc
 # Enables us to mix different versions of gnat and gnatgcc
-  rm -f $RPM_BUILD_ROOT%{_bindir}/@target_alias@-gnatgcc%{_exeext}
-  ln $RPM_BUILD_ROOT%{_bindir}/@target_alias@-gcc%{_exeext} \
-    $RPM_BUILD_ROOT%{_bindir}/@target_alias@-gnatgcc%{_exeext}
+  rm -f $RPM_BUILD_ROOT%{_bindir}/%{gcc_target}-gnatgcc%{_exeext}
+  ln $RPM_BUILD_ROOT%{_bindir}/%{gcc_target}-gcc%{_exeext} \
+    $RPM_BUILD_ROOT%{_bindir}/%{gcc_target}-gnatgcc%{_exeext}
 %endif
 
   # Bug in gcc-3.x: It puts the build dirs into *.la files
@@ -259,25 +274,36 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
   if test -f $RPM_BUILD_ROOT%{_prefix}/bin/cpp%{_exeext};
   then
     mv $RPM_BUILD_ROOT%{_prefix}/bin/cpp%{_exeext} \
-      $RPM_BUILD_ROOT%{_prefix}/bin/@target_alias@-cpp%{_exeext}
+      $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target}-cpp%{_exeext}
   fi
 %endif
 
+%if %build_cxx
+%if "%{gcc_version}" >= "3.3"
+  install -d $RPM_BUILD_ROOT%{_prefix}/bin
+  install -c -m 755 %{gcc_target}/libiberty/c++filt%{_exeext} \
+     $RPM_BUILD_ROOT%{_prefix}/bin/%{target_alias}-c++filt%{_exeext}
+%endif
+%endif
+
   # gzip info files
   gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null
+%if "%{gcc_version}" < "3.3"
+  # gcc-3.3 ships monolytic *.infos
   gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-? 2>/dev/null
   gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-?? 2>/dev/null
+%endif
 
   rm -f dirs ;
   echo "%defattr(-,root,root)" >> dirs
   echo "%dir %{_prefix}/lib" >> dirs ;
   echo "%dir %{_prefix}/lib/gcc-lib" >> dirs ;
-  echo "%dir %{_prefix}/lib/gcc-lib/@target_alias@" >> dirs ;
+  echo "%dir %{_prefix}/lib/gcc-lib/%{gcc_target}" >> dirs ;
 
   # Collect multilib subdirectories
   f=`gcc/xgcc -Bgcc/ --print-multi-lib | sed -e 's,;.*$,,'`
 
-  TGTDIR="%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}"
+  TGTDIR="%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}"
   for i in $f; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> dirs
@@ -287,7 +313,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
     esac
   done
 
-  TGTDIR="%{_prefix}/@target_alias@/lib"
+  TGTDIR="%{_prefix}/%{gcc_target}/lib"
   for i in $f; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> dirs
@@ -304,7 +330,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
   cp dirs files.gcj
   cp dirs files.g++
 
-  TGTDIR="%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}"
+  TGTDIR="%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}"
   f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
   for i in $f; do
     case $i in
@@ -327,7 +353,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
     esac
   done
 
-  TGTDIR="%{_prefix}/@target_alias@/lib"
+  TGTDIR="%{_prefix}/%{gcc_target}/lib"
   f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
   for i in $f; do
     case $i in
diff --git a/scripts/gcc3newlib/mkspec.in b/scripts/gcc3newlib/mkspec.in
index 3b4391da77..0492edd10a 100644
--- a/scripts/gcc3newlib/mkspec.in
+++ b/scripts/gcc3newlib/mkspec.in
@@ -69,6 +69,8 @@ sed -e "s,@PATCH1\@,${PATCH1}," \
     -e "s%@Release\@%${gcc3newlib_rpm_release}%g" \
     -e "s%@target_alias\@%${target_alias}%g" \
     -e "s%@prefix\@%@prefix@%g" \
+    -e "s,@rpmprefix\@,@rpmprefix@,g" \
+    -e "s%@rpmgroup\@%@rpmgroup@%g" \
     -e "s,@rpm_build_root\@,${rpm_build_root},g" \
     -e "s%@gcc_version\@%${gcc3_version}%g" \
     -e "s%@gcc_patch_version\@%${gcc3_patch_version}%g" \
diff --git a/scripts/gcc3newlib/target-c++.add b/scripts/gcc3newlib/target-c++.add
index 3f15672352..e2fe80a86b 100644
--- a/scripts/gcc3newlib/target-c++.add
+++ b/scripts/gcc3newlib/target-c++.add
@@ -1,32 +1,31 @@
 %if %build_cxx
 # ==============================================================
-# @target_alias@-c++
+# %{gcc_target}-c++
 # ==============================================================
-%package -n @target_alias@-c++
-Provides:	@target_alias@-c++
-Summary:      gcc/g++ compiler (c++) for @target_alias@
-Group: rtems
-Requires: rtems-base-gcc @target_alias@-gcc
+%package -n %{rpmprefix}%{gcc_target}-c++
+Summary:      gcc/g++ compiler (c++) for %{gcc_target}
+Group: %{rpmgroup}
+Requires: %{rpmprefix}rtems-base-gcc %{rpmprefix}%{gcc_target}-gcc
 
-%description -n @target_alias@-c++
+%description -n %{rpmprefix}%{gcc_target}-c++
 RTEMS is an open source operating system for embedded systems.
 
-This is the gcc/g++ compiler for @target_alias@
+This is the gcc/g++ compiler for %{gcc_target}
 
-%files -n @target_alias@-c++ -f build/files.g++
+%files -n %{rpmprefix}%{gcc_target}-c++ -f build/files.g++
 %defattr(-,root,root)
-%doc %{_prefix}/man/man1/@target_alias@-g++.1*
+%doc %{_prefix}/man/man1/%{gcc_target}-g++.1*
 
 %dir %{_prefix}/bin
-%{_prefix}/bin/@target_alias@-c++%{_exeext}
-%{_prefix}/bin/@target_alias@-g++%{_exeext}
-%{_prefix}/bin/@target_alias@-c++filt%{_exeext}
+%{_prefix}/bin/%{gcc_target}-c++%{_exeext}
+%{_prefix}/bin/%{gcc_target}-g++%{_exeext}
+%{_prefix}/bin/%{gcc_target}-c++filt%{_exeext}
 
-%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/cc1plus%{_exeext}
-%dir %{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/include
+%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/cc1plus%{_exeext}
+%dir %{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/include
 %if "%{gcc_version}" >= "3.2"
-%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/include/c++
+%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/include/c++
 %else
-%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/include/g++
+%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/include/g++
 %endif
 %endif
diff --git a/scripts/gcc3newlib/target-g77.add b/scripts/gcc3newlib/target-g77.add
index 1839fcb7c9..0e2b696855 100644
--- a/scripts/gcc3newlib/target-g77.add
+++ b/scripts/gcc3newlib/target-g77.add
@@ -1,22 +1,21 @@
 %if %build_g77
 # ==============================================================
-# @target_alias@-g77
+# %{gcc_target}-g77
 # ==============================================================
-%package -n @target_alias@-g77
-Provides:	@target_alias@-g77
-Summary:	gcc/g77 compiler for @target_alias@
-Group: rtems
-Requires: rtems-base-g77 @target_alias@-gcc
+%package -n %{rpmprefix}%{gcc_target}-g77
+Summary:	gcc/g77 compiler for %{gcc_target}
+Group: %{rpmgroup}
+Requires: %{rpmprefix}rtems-base-g77 %{rpmprefix}%{gcc_target}-gcc
 
-%description -n @target_alias@-g77
+%description -n %{rpmprefix}%{gcc_target}-g77
 RTEMS is an open source operating system for embedded systems.
 
-This is the gcc/g77 compiler for @target_alias@
+This is the gcc/g77 compiler for %{gcc_target}
 
-%files -n @target_alias@-g77 -f build/files.g77
+%files -n %{rpmprefix}%{gcc_target}-g77 -f build/files.g77
 %defattr(-,root,root)
 %dir %{_prefix}/bin
-%{_prefix}/bin/@target_alias@-g77%{_exeext}
+%{_prefix}/bin/%{gcc_target}-g77%{_exeext}
 
-%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/f771%{_exeext}
+%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/f771%{_exeext}
 %endif
diff --git a/scripts/gcc3newlib/target-gcc.add b/scripts/gcc3newlib/target-gcc.add
index dfcff5249b..161d902524 100644
--- a/scripts/gcc3newlib/target-gcc.add
+++ b/scripts/gcc3newlib/target-gcc.add
@@ -1,25 +1,27 @@
 # ==============================================================
-# @target_alias@-gcc
+# %{gcc_target}-gcc
 # ==============================================================
-%package -n @target_alias@-gcc
-Provides:	@target_alias@-gcc
-Summary:      	rtems gcc and newlib C Library for @target_alias@
-Group: rtems
-Requires: @target_alias@-binutils rtems-base-gcc
+%package -n %{rpmprefix}%{gcc_target}-gcc
+Summary:      	rtems gcc and newlib C Library for %{gcc_target}
+Group: %{rpmgroup}
+Requires: %{rpmprefix}%{gcc_target}-binutils %{rpmprefix}rtems-base-gcc
 
-%description -n @target_alias@-gcc
+%description -n %{rpmprefix}%{gcc_target}-gcc
 RTEMS is an open source operating system for embedded systems.
 
-This is gcc and newlib C Library for @target_alias@.
+This is gcc and newlib C Library for %{gcc_target}.
 
-%files -n @target_alias@-gcc -f build/files.gcc
+%files -n %{rpmprefix}%{gcc_target}-gcc -f build/files.gcc
 %defattr(-,root,root)
-%doc %{_prefix}/man/man1/@target_alias@-gcc.1*
+%doc %{_prefix}/man/man1/%{gcc_target}-gcc.1*
 
-%{_prefix}/bin/@target_alias@-cpp%{_exeext}
-%{_prefix}/bin/@target_alias@-gcc%{_exeext}
-%{_prefix}/bin/@target_alias@-gcov%{_exeext}
-%{_prefix}/bin/@target_alias@-gccbug
-%{_prefix}/@target_alias@/include
+%{_prefix}/bin/%{gcc_target}-cpp%{_exeext}
+%{_prefix}/bin/%{gcc_target}-gcc%{_exeext}
+%if "%{gcc_version}" >= "3.3"
+%{_prefix}/bin/%{gcc_target}-gcc-%{gcc_version}%{_exeext}
+%endif
+%{_prefix}/bin/%{gcc_target}-gcov%{_exeext}
+%{_prefix}/bin/%{gcc_target}-gccbug
+%{_prefix}/%{gcc_target}/include
 
-%dir %{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/include
+%dir %{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/include
diff --git a/scripts/gcc3newlib/target-gcj.add b/scripts/gcc3newlib/target-gcj.add
index b2389e7434..d1a5e6b9c2 100644
--- a/scripts/gcc3newlib/target-gcj.add
+++ b/scripts/gcc3newlib/target-gcj.add
@@ -1,28 +1,27 @@
 %if %build_gcj
 # ==============================================================
-# @target_alias@-gcj
+# %{gcc_target}-gcj
 # ==============================================================
-%package -n @target_alias@-gcj
-Provides:	@target_alias@-gcj
-Summary:      gcc/java compiler (gcj) for @target_alias@
-Group: rtems
-Requires: rtems-base-gcj @target_alias@-gcc
+%package -n %{rpmprefix}%{gcc_target}-gcj
+Summary:      gcc/java compiler (gcj) for %{gcc_target}
+Group: %{rpmgroup}
+Requires: %{rpmprefix}rtems-base-gcj %{rpmprefix}%{gcc_target}-gcc
 
-%description -n @target_alias@-gcj
+%description -n %{rpmprefix}%{gcc_target}-gcj
 RTEMS is an open source operating system for embedded systems.
 
-This is the gcc/java compiler for @target_alias@
+This is the gcc/java compiler for %{gcc_target}
 
-%files -n @target_alias@-gcj -f build/files.gcj
+%files -n %{rpmprefix}%{gcc_target}-gcj -f build/files.gcj
 %defattr(-,root,root)
 %dir %{_prefix}/bin
-%{_prefix}/bin/@target_alias@-gcj%{_exeext}
-%{_prefix}/bin/@target_alias@-jcf-dump%{_exeext}
-%{_prefix}/bin/@target_alias@-jv-scan%{_exeext}
-%{_prefix}/bin/@target_alias@-gcjh%{_exeext}
-%{_prefix}/man/man1/@target_alias@-gcj.1
+%{_prefix}/bin/%{gcc_target}-gcj%{_exeext}
+%{_prefix}/bin/%{gcc_target}-jcf-dump%{_exeext}
+%{_prefix}/bin/%{gcc_target}-jv-scan%{_exeext}
+%{_prefix}/bin/%{gcc_target}-gcjh%{_exeext}
+%{_prefix}/man/man1/%{gcc_target}-gcj.1
 
-%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/jc1%{_exeext}
-%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/jvgenmain%{_exeext}
+%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/jc1%{_exeext}
+%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/jvgenmain%{_exeext}
 
 %endif
diff --git a/scripts/gcc3newlib/target-gnat.add b/scripts/gcc3newlib/target-gnat.add
index cf2e568759..6e9d1166a0 100644
--- a/scripts/gcc3newlib/target-gnat.add
+++ b/scripts/gcc3newlib/target-gnat.add
@@ -1,25 +1,23 @@
 %if %build_gnat
 # ==============================================================
-# @target_alias@-gnat
+# %{gcc_target}-gnat
 # ==============================================================
-%package -n @target_alias@-gnat
-Provides:	@target_alias@-gnat
-Summary:	gcc/gnat compiler for @target_alias@
-Group: rtems
-Requires: rtems-base-gnat @target_alias@-gcc
+%package -n %{rpmprefix}%{gcc_target}-gnat
+Summary:	gcc/gnat compiler for %{gcc_target}
+Group: %{rpmgroup}
+Requires: %{rpmprefix}rtems-base-gnat %{rpmprefix}%{gcc_target}-gcc
 
-%description -n @target_alias@-gnat
+%description -n %{rpmprefix}%{gcc_target}-gnat
 RTEMS is an open source operating system for embedded systems.
 
-This is the gcc/gnat compiler for @target_alias@
+This is the gcc/gnat compiler for %{gcc_target}
 
-%files -n @target_alias@-gnat
+%files -n %{rpmprefix}%{gcc_target}-gnat
 %defattr(-,root,root)
-# %files -n @target_alias@-gnat -f build/files.gnat
 %dir %{_prefix}/bin
-%{_prefix}/bin/@target_alias@-gnat*
+%{_prefix}/bin/%{gcc_target}-gnat*
 
-%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/gnat1%{_exeext}
-%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/adalib
-%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/adainclude
+%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/gnat1%{_exeext}
+%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/adalib
+%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/adainclude
 %endif
diff --git a/scripts/gcc3newlib/target-objc.add b/scripts/gcc3newlib/target-objc.add
index b126a8f0b7..27f66f5bee 100644
--- a/scripts/gcc3newlib/target-objc.add
+++ b/scripts/gcc3newlib/target-objc.add
@@ -1,20 +1,19 @@
 %if %build_objc
 # ==============================================================
-# @target_alias@-objc
+# %{gcc_target}-objc
 # ==============================================================
-%package -n @target_alias@-objc
-Provides:	@target_alias@-objc
-Summary:      gcc/objc compiler for @target_alias@
-Group: rtems
-Requires: @target_alias@-gcc
+%package -n %{rpmprefix}%{gcc_target}-objc
+Summary:      gcc/objc compiler for %{gcc_target}
+Group: %{rpmgroup}
+Requires: %{rpmprefix}%{gcc_target}-gcc
 
-%description -n @target_alias@-objc
+%description -n %{rpmprefix}%{gcc_target}-objc
 RTEMS is an open source operating system for embedded systems.
 
-This is the gcc/objc compiler for @target_alias@
+This is the gcc/objc compiler for %{gcc_target}
 
-%files -n @target_alias@-objc -f build/files.objc
+%files -n %{rpmprefix}%{gcc_target}-objc -f build/files.objc
 %defattr(-,root,root)
-%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/cc1obj%{_exeext}
-%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/include/objc
+%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/cc1obj%{_exeext}
+%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/include/objc
 %endif