summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-08-24 04:41:10 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-08-24 04:41:10 +0000
commitae67478147e433420a0ae69a4d0163d893eb9ec2 (patch)
treede09f68a8663ab23427f67e8ac7b2bbc858b71bd /scripts
parent2003-08-22 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-ae67478147e433420a0ae69a4d0163d893eb9ec2.tar.bz2
2003-08-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* common/common.add.in: s/www.oarcorp.com/www.rtems.com/. Add %define __os_install_post %{nil} to prevent RH-9's rpm-brp-strip from running (Chokes on foreign object formats). * gcc3newlib/base-g77.add: Use %{gcc_version} instead of @gcc_version@. * gcc3newlib/gccnewlib.add: Use %{gcc_version} instead of @gcc_version@. Reflect gcc >= 3.3 shipping monolytic infos. * gcc3newlib/target-c++.add: Use %{gcc_version} instead of @gcc_version@. Don't pickup c++filt. * gcc3newlib/target-g77.add: Use %{gcc_version} instead of @gcc_version@. * gcc3newlib/target-gcc.add: Use %{gcc_version} instead of @gcc_version@. * gcc3newlib/target-gcj.add: Use %{gcc_version} instead of @gcc_version@. * gcc3newlib/target-gnat.add: Use %{gcc_version} instead of @gcc_version@. * gcc3newlib/target-objc.add: Use %{gcc_version} instead of @gcc_version@.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/ChangeLog24
-rw-r--r--scripts/common/common.add.in5
-rw-r--r--scripts/gcc3newlib/base-g77.add2
-rw-r--r--scripts/gcc3newlib/gccnewlib.add65
-rw-r--r--scripts/gcc3newlib/target-c++.add34
-rw-r--r--scripts/gcc3newlib/target-g77.add20
-rw-r--r--scripts/gcc3newlib/target-gcc.add33
-rw-r--r--scripts/gcc3newlib/target-gcj.add30
-rw-r--r--scripts/gcc3newlib/target-gnat.add26
-rw-r--r--scripts/gcc3newlib/target-objc.add20
10 files changed, 148 insertions, 111 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 4b999a8de1..ca1485fff5 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,27 @@
+2003-08-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * common/common.add.in: s/www.oarcorp.com/www.rtems.com/.
+ Add %define __os_install_post %{nil} to prevent RH-9's rpm-brp-strip
+ from running (Chokes on foreign object formats).
+ * gcc3newlib/base-g77.add:
+ Use %{gcc_version} instead of @gcc_version@.
+ * gcc3newlib/gccnewlib.add:
+ Use %{gcc_version} instead of @gcc_version@.
+ Reflect gcc >= 3.3 shipping monolytic infos.
+ * gcc3newlib/target-c++.add:
+ Use %{gcc_version} instead of @gcc_version@.
+ Don't pickup c++filt.
+ * gcc3newlib/target-g77.add:
+ Use %{gcc_version} instead of @gcc_version@.
+ * gcc3newlib/target-gcc.add:
+ Use %{gcc_version} instead of @gcc_version@.
+ * gcc3newlib/target-gcj.add:
+ Use %{gcc_version} instead of @gcc_version@.
+ * gcc3newlib/target-gnat.add:
+ Use %{gcc_version} instead of @gcc_version@.
+ * gcc3newlib/target-objc.add:
+ Use %{gcc_version} instead of @gcc_version@.
+
2003-08-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* binutils/binutils.add: Preps for 2.14.
diff --git a/scripts/common/common.add.in b/scripts/common/common.add.in
index 9b977d6692..12f3a55c10 100644
--- a/scripts/common/common.add.in
+++ b/scripts/common/common.add.in
@@ -1,6 +1,6 @@
#
# Please send bugfixes or comments to
-# http://www.oarcorp.com/cgi-bin/gnatweb.pl
+# http://www.rtems.com/cgi-bin/gnatweb.pl
# or mailto:@PACKAGE_BUGREPORT@
#
@@ -12,6 +12,9 @@
%define _exeext %{nil}
%endif
+# Without this, RPM-4.x' rpm-brp-strip screws up on cross-binaries
+%define __os_install_post %{nil}
+
Vendor: OARCorp
Distribution: Linux
diff --git a/scripts/gcc3newlib/base-g77.add b/scripts/gcc3newlib/base-g77.add
index b2495f4b2c..1aaf604672 100644
--- a/scripts/gcc3newlib/base-g77.add
+++ b/scripts/gcc3newlib/base-g77.add
@@ -20,7 +20,7 @@ This is the files for gcc/g77 that are shared by all targets.
%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
if test -d $RPM_INSTALL_PREFIX%{_prefix}/info;
diff --git a/scripts/gcc3newlib/gccnewlib.add b/scripts/gcc3newlib/gccnewlib.add
index 18426b3e81..fc806527d0 100644
--- a/scripts/gcc3newlib/gccnewlib.add
+++ b/scripts/gcc3newlib/gccnewlib.add
@@ -2,8 +2,10 @@
%define gcc_version @gcc_version@
%define newlib_version @newlib_version@
-Name: @target_alias@-gcc-newlib
-Summary: gcc and newlib C Library for @target_alias@.
+%define gcc_target @target_alias@
+
+Name: %{gcc_target}-gcc-newlib
+Summary: gcc and newlib C Library for %{gcc_target}.
Group: rtems
Release: @Release@
License: gcc is GPL/LGPL ; newlib no has restrictions on run-time usage
@@ -13,15 +15,15 @@ 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
+# 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
Source1: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz
@PATCH1@
@PATCH3@
BuildPreReq: texinfo >= 4.2
-BuildPreReq: @target_alias@-binutils
+BuildPreReq: %{gcc_target}-binutils
#
# The original sources are not included in the source RPM.
# If we included them, then the source RPMs for each target
@@ -65,38 +67,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 +135,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@
@@ -177,7 +179,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
%endif
../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 \
@@ -212,11 +214,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
@@ -226,15 +228,15 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
%install
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 +245,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 +261,28 @@ 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
# 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 +292,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 +309,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 +332,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/target-c++.add b/scripts/gcc3newlib/target-c++.add
index 3f15672352..f73670cc2e 100644
--- a/scripts/gcc3newlib/target-c++.add
+++ b/scripts/gcc3newlib/target-c++.add
@@ -1,32 +1,34 @@
%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@
+%package -n %{gcc_target}-c++
+Provides: %{gcc_target}-c++
+Summary: gcc/g++ compiler (c++) for %{gcc_target}
Group: rtems
-Requires: rtems-base-gcc @target_alias@-gcc
+Requires: rtems-base-gcc %{gcc_target}-gcc
-%description -n @target_alias@-c++
+%description -n %{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 %{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}
+%if "{gcc_version}" < "3.3"
+%{_prefix}/bin/%{gcc_target}-c++filt%{_exeext}
+%endif
-%{_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..abd1b5e792 100644
--- a/scripts/gcc3newlib/target-g77.add
+++ b/scripts/gcc3newlib/target-g77.add
@@ -1,22 +1,22 @@
%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@
+%package -n %{gcc_target}-g77
+Provides: %{gcc_target}-g77
+Summary: gcc/g77 compiler for %{gcc_target}
Group: rtems
-Requires: rtems-base-g77 @target_alias@-gcc
+Requires: rtems-base-g77 %{gcc_target}-gcc
-%description -n @target_alias@-g77
+%description -n %{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 %{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..25bf77d525 100644
--- a/scripts/gcc3newlib/target-gcc.add
+++ b/scripts/gcc3newlib/target-gcc.add
@@ -1,25 +1,28 @@
# ==============================================================
-# @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@
+%package -n %{gcc_target}-gcc
+Provides: %{gcc_target}-gcc
+Summary: rtems gcc and newlib C Library for %{gcc_target}
Group: rtems
-Requires: @target_alias@-binutils rtems-base-gcc
+Requires: %{gcc_target}-binutils rtems-base-gcc
-%description -n @target_alias@-gcc
+%description -n %{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 %{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..4d8b144ea7 100644
--- a/scripts/gcc3newlib/target-gcj.add
+++ b/scripts/gcc3newlib/target-gcj.add
@@ -1,28 +1,28 @@
%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@
+%package -n %{gcc_target}-gcj
+Provides: %{gcc_target}-gcj
+Summary: gcc/java compiler (gcj) for %{gcc_target}
Group: rtems
-Requires: rtems-base-gcj @target_alias@-gcc
+Requires: rtems-base-gcj %{gcc_target}-gcc
-%description -n @target_alias@-gcj
+%description -n %{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 %{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..6490fd1b2c 100644
--- a/scripts/gcc3newlib/target-gnat.add
+++ b/scripts/gcc3newlib/target-gnat.add
@@ -1,25 +1,25 @@
%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@
+%package -n %{gcc_target}-gnat
+Provides: %{gcc_target}-gnat
+Summary: gcc/gnat compiler for %{gcc_target}
Group: rtems
-Requires: rtems-base-gnat @target_alias@-gcc
+Requires: rtems-base-gnat %{gcc_target}-gcc
-%description -n @target_alias@-gnat
+%description -n %{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 %{gcc_target}-gnat
%defattr(-,root,root)
-# %files -n @target_alias@-gnat -f build/files.gnat
+# %files -n %{gcc_target}-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..7c723c0f35 100644
--- a/scripts/gcc3newlib/target-objc.add
+++ b/scripts/gcc3newlib/target-objc.add
@@ -1,20 +1,20 @@
%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@
+%package -n %{gcc_target}-objc
+Provides: %{gcc_target}-objc
+Summary: gcc/objc compiler for %{gcc_target}
Group: rtems
-Requires: @target_alias@-gcc
+Requires: %{gcc_target}-gcc
-%description -n @target_alias@-objc
+%description -n %{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 %{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