Merger from rtems-4-6-branch.

8 files changed, 47 insertions, 40 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 0aa0804d2d..4a4fc1377a 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,10 +1,13 @@
-2003-02-26	RTEMS
-
-	* setup.def: Updated gdb revision to -2 so arm will build and
-	to fix psim build problem on NetBSD.   
-	* gcc3newlib/gccnewlib.add: Ignore dependency on GNAT RPM since
-	RedHat 7.3 doesn't have it available.  Maybe later.
-	* gdb/Makefile.am: Cleanup way the RPM_SPECS_DATA variable is built.
+2003-02-26	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* gcc3newlib/gccnewlib.add: Add %gcc_version, %newlib_version.
+	Apply %gcc_version, %newlib_version.
+	* gcc3newlib/target-c++.add: Apply %gcc_version, %newlib_version.
+	* gcc3newlib/target-g77.add: Apply %gcc_version, %newlib_version.
+	* gcc3newlib/target-gcc.add: Apply %gcc_version, %newlib_version.
+	* gcc3newlib/target-gcj.add: Apply %gcc_version, %newlib_version.
+	* gcc3newlib/target-gnat.add: Apply %gcc_version, %newlib_version.
+	* gcc3newlib/target-objc.add: Apply %gcc_version, %newlib_version.
 
 2003-02-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
diff --git a/scripts/gcc3newlib/gccnewlib.add b/scripts/gcc3newlib/gccnewlib.add
index f52c59286d..43e5afb034 100644
--- a/scripts/gcc3newlib/gccnewlib.add
+++ b/scripts/gcc3newlib/gccnewlib.add
@@ -1,3 +1,7 @@
+
+%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
@@ -7,13 +11,13 @@ License:      gcc is GPL/LGPL ; newlib no has restrictions on run-time usage
 Autoreqprov:  	on
 Packager:     	corsepiu@faw.uni-ulm.de and joel@OARcorp.com
 
-Version:      	gcc@gcc_version@newlib@newlib_version@
+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
+# 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
@@ -35,7 +39,7 @@ NoSource:	1
 # Use rpm -ba --define 'gnat [0|1]' xxx.spec to override building gnat for 
 # those targets wanting to support ada.
 
-%if "@gcc_version@" >= "3.2"
+%if "%{gcc_version}" >= "3.2"
 # default to building gnat
 %define _gnat	%{?gnat:%gnat}%{!?gnat:1}
 %else
@@ -46,7 +50,7 @@ NoSource:	1
 # Use rpm -ba --define 'gcj [0|1]' xxx.spec to override building gcj for 
 # those targets wanting to support gcj.
 
-%if "@gcc_version@" >= "3.2"
+%if "%{gcc_version}" >= "3.2"
 # default to building gcj
 %define _gcj	%{?gcj:%gcj}%{!?gcj:1}
 %else
@@ -135,8 +139,8 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
 @PATCH2@
 @PATCH4@
 
-  cd gcc-@gcc_version@
-    sed -e 's/\(version_string = \"[^\"]*\)/\1 (OAR Corporation gcc-@gcc_version@-@gcc_patch_version@\/newlib-@newlib_version@-@newlib_patch_version@ @Release@)/' \
+  cd gcc-%{gcc_version}
+    sed -e 's/\(version_string = \"[^\"]*\)/\1 (OAR Corporation gcc-%{gcc_version}-@gcc_patch_version@\/newlib-%{newlib_version}-@newlib_patch_version@-@Release@)/' \
     gcc/version.c > gcc/version.c~
     mv gcc/version.c~  gcc/version.c 
 
@@ -145,7 +149,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
   cd ..
 
   # Copy the C library into gcc's source tree
-  ln -s ../newlib-@newlib_version@/newlib gcc-@gcc_version@
+  ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_version}
   test -d build || mkdir build
 
 %build
@@ -171,7 +175,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
 %if %build_gnat
   languages="$languages,ada"
 %endif
-  ../gcc-@gcc_version@/configure \
+  ../gcc-%{gcc_version}/configure \
     --build=%_build --host=%_host \
     --target=@target_alias@ \
     --with-gnu-as --with-gnu-ld --with-newlib --verbose \
@@ -184,11 +188,11 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
   # Bug in gcc-3.2.1:
   # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
   test -d gcc/include || mkdir -p gcc/include
-  cp ../gcc-@gcc_version@/gcc/gsyslimits.h gcc/include/syslimits.h
+  cp ../gcc-%{gcc_version}/gcc/gsyslimits.h gcc/include/syslimits.h
 %endif
 
 %if %build_gnat
-  cd ../gcc-@gcc_version@/gcc/ada
+  cd ../gcc-%{gcc_version}/gcc/ada
   touch treeprs.ads [es]info.h nmake.ad[bs]
   cd ../../../build
 %endif
@@ -209,7 +213,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
   GNATLIBCFLAGS="-g -O2"
 # Let gnatlib building find newlib's headers
   GNATLIBCFLAGS="$GNATLIBCFLAGS -isystem `pwd`/@target_alias@/newlib/targ-include"
-  GNATLIBCFLAGS="$GNATLIBCFLAGS -isystem `pwd`/../newlib-@newlib_version@/newlib/libc/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"
@@ -223,8 +227,8 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
   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 "@gcc_version@" < "3.0"
-  ../gcc-@gcc_version@/mkinstalldirs \
+%if "%{gcc_version}" < "3.0"
+  ../gcc-%{gcc_version}/mkinstalldirs \
     $RPM_BUILD_ROOT%{_prefix}/@target_alias@/bin
 %endif
 
@@ -249,7 +253,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
   # host library
   rm -f  ${RPM_BUILD_ROOT}%{_prefix}/lib/libiberty.a
 
-%if "@gcc_version@" < "3.0"
+%if "%{gcc_version}" < "3.0"
   # Bug in gcc-2.95.x: It bogusly tries to share cpp for all targets.
   # Rename it to target_alias-cpp
   if test -f $RPM_BUILD_ROOT%{_prefix}/bin/cpp%{_exeext};
@@ -273,7 +277,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
   # 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/@target_alias@/%{gcc_version}"
   for i in $f; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> dirs
@@ -300,7 +304,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/@target_alias@/%{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
diff --git a/scripts/gcc3newlib/target-c++.add b/scripts/gcc3newlib/target-c++.add
index ae747fdea3..3f15672352 100644
--- a/scripts/gcc3newlib/target-c++.add
+++ b/scripts/gcc3newlib/target-c++.add
@@ -22,11 +22,11 @@ This is the gcc/g++ compiler for @target_alias@
 %{_prefix}/bin/@target_alias@-g++%{_exeext}
 %{_prefix}/bin/@target_alias@-c++filt%{_exeext}
 
-%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/cc1plus%{_exeext}
-%dir %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/include
-%if "@gcc_version@" >= "3.2"
-%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/include/c++
+%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/cc1plus%{_exeext}
+%dir %{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/include
+%if "%{gcc_version}" >= "3.2"
+%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/include/c++
 %else
-%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/include/g++
+%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/include/g++
 %endif
 %endif
diff --git a/scripts/gcc3newlib/target-g77.add b/scripts/gcc3newlib/target-g77.add
index b06213cf93..1839fcb7c9 100644
--- a/scripts/gcc3newlib/target-g77.add
+++ b/scripts/gcc3newlib/target-g77.add
@@ -18,5 +18,5 @@ This is the gcc/g77 compiler for @target_alias@
 %dir %{_prefix}/bin
 %{_prefix}/bin/@target_alias@-g77%{_exeext}
 
-%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/f771%{_exeext}
+%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/f771%{_exeext}
 %endif
diff --git a/scripts/gcc3newlib/target-gcc.add b/scripts/gcc3newlib/target-gcc.add
index 804bd2b01d..dfcff5249b 100644
--- a/scripts/gcc3newlib/target-gcc.add
+++ b/scripts/gcc3newlib/target-gcc.add
@@ -22,4 +22,4 @@ This is gcc and newlib C Library for @target_alias@.
 %{_prefix}/bin/@target_alias@-gccbug
 %{_prefix}/@target_alias@/include
 
-%dir %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/include
+%dir %{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/include
diff --git a/scripts/gcc3newlib/target-gcj.add b/scripts/gcc3newlib/target-gcj.add
index 4d2d34f56f..b2389e7434 100644
--- a/scripts/gcc3newlib/target-gcj.add
+++ b/scripts/gcc3newlib/target-gcj.add
@@ -22,7 +22,7 @@ This is the gcc/java compiler for @target_alias@
 %{_prefix}/bin/@target_alias@-gcjh%{_exeext}
 %{_prefix}/man/man1/@target_alias@-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/@target_alias@/%{gcc_version}/jc1%{_exeext}
+%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/jvgenmain%{_exeext}
 
 %endif
diff --git a/scripts/gcc3newlib/target-gnat.add b/scripts/gcc3newlib/target-gnat.add
index 313e5ac365..cf2e568759 100644
--- a/scripts/gcc3newlib/target-gnat.add
+++ b/scripts/gcc3newlib/target-gnat.add
@@ -19,7 +19,7 @@ This is the gcc/gnat compiler for @target_alias@
 %dir %{_prefix}/bin
 %{_prefix}/bin/@target_alias@-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/@target_alias@/%{gcc_version}/gnat1%{_exeext}
+%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/adalib
+%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/adainclude
 %endif
diff --git a/scripts/gcc3newlib/target-objc.add b/scripts/gcc3newlib/target-objc.add
index d2f7f5b699..b126a8f0b7 100644
--- a/scripts/gcc3newlib/target-objc.add
+++ b/scripts/gcc3newlib/target-objc.add
@@ -15,6 +15,6 @@ This is the gcc/objc compiler for @target_alias@
 
 %files -n @target_alias@-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/@target_alias@/%{gcc_version}/cc1obj%{_exeext}
+%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/include/objc
 %endif