2003-01-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* gcc3newlib/gccnewlib.add: Remove header, broken cdn-X configuration,
	%clean, Replace @exe_ext@ with %{_exeext}.
	* gcc3newlib/mkspec.in: Remove exe_ext.
	* gcc3newlib/target-c++.add: Replace @exe_ext@ with %{_exeext}.
	* gcc3newlib/target-g77.add: Replace @exe_ext@ with %{_exeext}.
	* gcc3newlib/target-gcc.add: Replace @exe_ext@ with %{_exeext}.
	* gcc3newlib/target-gcj.add: Replace @exe_ext@ with %{_exeext}.
	* gcc3newlib/target-gnat.add: Replace @exe_ext@ with %{_exeext}.
	* gcc3newlib/target-objc.add: Replace @exe_ext@ with %{_exeext}.
	+ gcc3newlib/Makefile.am: Use $(top_builddir)/common/common.add,
	$(top_builddir)/common/clean.add, header.add.

10 files changed, 45 insertions, 50 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index bf78613c27..0c55d979b0 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,5 +1,19 @@
 2003-01-31	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
+	* gcc3newlib/gccnewlib.add: Remove header, broken cdn-X configuration,
+	%clean, Replace @exe_ext@ with %{_exeext}.
+	* gcc3newlib/mkspec.in: Remove exe_ext.
+	* gcc3newlib/target-c++.add: Replace @exe_ext@ with %{_exeext}.
+	* gcc3newlib/target-g77.add: Replace @exe_ext@ with %{_exeext}.
+	* gcc3newlib/target-gcc.add: Replace @exe_ext@ with %{_exeext}.
+	* gcc3newlib/target-gcj.add: Replace @exe_ext@ with %{_exeext}.
+	* gcc3newlib/target-gnat.add: Replace @exe_ext@ with %{_exeext}.
+	* gcc3newlib/target-objc.add: Replace @exe_ext@ with %{_exeext}.
+	+ gcc3newlib/Makefile.am: Use $(top_builddir)/common/common.add,
+	$(top_builddir)/common/clean.add, header.add.
+
+2003-01-31	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
 	* Makefile.am: Remove reference to mkbinutilsspec.
 	* configure.ac: Remove EXEEXT check.
 	Add common/clean.add, common/common.add.
diff --git a/scripts/gcc3newlib/Makefile.am b/scripts/gcc3newlib/Makefile.am
index 36e97724dd..9e02b98fba 100644
--- a/scripts/gcc3newlib/Makefile.am
+++ b/scripts/gcc3newlib/Makefile.am
@@ -4,8 +4,11 @@
 
 MKSPEC = $(SHELL) ./mkspec
 
-SUBPACKAGES = gccnewlib.add \
-    base-gcc.add target-gcc.add \
+SUBPACKAGES = header.add
+SUBPACKAGES += $(top_builddir)/common/common.add
+SUBPACKAGES += gccnewlib.add
+SUBPACKAGES += $(top_builddir)/common/clean.add
+SUBPACKAGES += base-gcc.add target-gcc.add \
     base-g77.add target-g77.add \
     base-gcj.add target-gcj.add \
     target-objc.add \
diff --git a/scripts/gcc3newlib/gccnewlib.add b/scripts/gcc3newlib/gccnewlib.add
index 0116502ca2..58f9be54d7 100644
--- a/scripts/gcc3newlib/gccnewlib.add
+++ b/scripts/gcc3newlib/gccnewlib.add
@@ -1,16 +1,3 @@
-#
-# spec file for building gcc for rtems
-# 
-# Copyright  (c) 1999,2000,2001,2002,2003 OARCorp, Huntsville, AL
-#
-# please send bugfixes or comments to joel@OARcorp.com
-#
-
-%define	_prefix	@prefix@
-%define _defaultbuildroot %{_tmppath}/%{name}-%{version}
-
-Vendor:       OAR Corporation
-Distribution: Linux
 Name:         @target_alias@-gcc-newlib
 Summary:      gcc and newlib C Library for @target_alias@.
 Group:	      rtems
@@ -152,10 +139,6 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
 %build
   cd build
 
-# HACK: This doesn't work
-# %if "%{_target_os}" != "%{_build_os}"
-#    CONFIGURE_ARGS="--build=%{_build} --host=%{_target}"
-# %endif
 #  ALERT: GCJ would be better if we could add this flag and build
 #  it's libraries but this code isn't ready to be embedded.
 #  libgcj_flag="--enable-libgcj"
@@ -176,7 +159,8 @@ 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 $CONFIGURE_ARGS --target=@target_alias@ \
+  ../gcc-@gcc_version@/configure \
+    --target=@target_alias@ \
     --with-gnu-as --with-gnu-ld --with-newlib --verbose \
     --with-system-zlib --disable-nls \
     --enable-version-specific-runtime-libs \
@@ -234,9 +218,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@exe_ext@
-  ln $RPM_BUILD_ROOT%{_bindir}/@target_alias@-gcc@exe_ext@ \
-    $RPM_BUILD_ROOT%{_bindir}/@target_alias@-gnatgcc@exe_ext@
+  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}
 %endif
 
   # Bug in gcc-3.x: It puts the build dirs into *.la files
@@ -247,10 +231,10 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
 %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@exe_ext@;
+  if test -f $RPM_BUILD_ROOT%{_prefix}/bin/cpp%{_exeext};
   then
-    mv $RPM_BUILD_ROOT%{_prefix}/bin/cpp@exe_ext@ \
-      $RPM_BUILD_ROOT%{_prefix}/bin/@target_alias@-cpp@exe_ext@
+    mv $RPM_BUILD_ROOT%{_prefix}/bin/cpp%{_exeext} \
+      $RPM_BUILD_ROOT%{_prefix}/bin/@target_alias@-cpp%{_exeext}
   fi
 %endif
 
@@ -329,7 +313,3 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
     esac
   done
 
-%clean
-# let rpm --clean remove BuildRoot iif using the default BuildRoot
-  test "$RPM_BUILD_ROOT" = "%{_defaultbuildroot}" && \
-    rm -rf $RPM_BUILD_ROOT
diff --git a/scripts/gcc3newlib/mkspec.in b/scripts/gcc3newlib/mkspec.in
index 07615c7fa2..3b4391da77 100644
--- a/scripts/gcc3newlib/mkspec.in
+++ b/scripts/gcc3newlib/mkspec.in
@@ -6,7 +6,6 @@
 RTEMS_DIR=`dirname $0`/@top_srcdir@
 
 CFG=../setup.cache
-exe_ext=@EXEEXT@
 
 usage()
 {
@@ -75,5 +74,4 @@ sed -e "s,@PATCH1\@,${PATCH1}," \
     -e "s%@gcc_patch_version\@%${gcc3_patch_version}%g" \
     -e "s%@newlib_version\@%${gcc3newlib_version}%g" \
     -e "s%@newlib_patch_version\@%${gcc3newlib_patch_version}%g" \
-    -e "s%@exe_ext\@%${exe_ext}%g" \
 < ${specsrc} 
diff --git a/scripts/gcc3newlib/target-c++.add b/scripts/gcc3newlib/target-c++.add
index e9e5ce9d52..ae747fdea3 100644
--- a/scripts/gcc3newlib/target-c++.add
+++ b/scripts/gcc3newlib/target-c++.add
@@ -18,11 +18,11 @@ This is the gcc/g++ compiler for @target_alias@
 %doc %{_prefix}/man/man1/@target_alias@-g++.1*
 
 %dir %{_prefix}/bin
-%{_prefix}/bin/@target_alias@-c++@exe_ext@
-%{_prefix}/bin/@target_alias@-g++@exe_ext@
-%{_prefix}/bin/@target_alias@-c++filt@exe_ext@
+%{_prefix}/bin/@target_alias@-c++%{_exeext}
+%{_prefix}/bin/@target_alias@-g++%{_exeext}
+%{_prefix}/bin/@target_alias@-c++filt%{_exeext}
 
-%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/cc1plus@exe_ext@
+%{_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++
diff --git a/scripts/gcc3newlib/target-g77.add b/scripts/gcc3newlib/target-g77.add
index 70957405c2..b06213cf93 100644
--- a/scripts/gcc3newlib/target-g77.add
+++ b/scripts/gcc3newlib/target-g77.add
@@ -16,7 +16,7 @@ This is the gcc/g77 compiler for @target_alias@
 %files -n @target_alias@-g77 -f build/files.g77
 %defattr(-,root,root)
 %dir %{_prefix}/bin
-%{_prefix}/bin/@target_alias@-g77@exe_ext@
+%{_prefix}/bin/@target_alias@-g77%{_exeext}
 
-%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/f771@exe_ext@
+%{_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 cc4f248714..800c46f8c2 100644
--- a/scripts/gcc3newlib/target-gcc.add
+++ b/scripts/gcc3newlib/target-gcc.add
@@ -16,10 +16,10 @@ This is gcc and newlib C Library for @target_alias@.
 %defattr(-,root,root)
 %doc %{_prefix}/man/man1/@target_alias@-gcc.1*
 
-%{_prefix}/bin/@target_alias@-cpp@exe_ext@
-%{_prefix}/bin/@target_alias@-gcc@exe_ext@
-%{_prefix}/bin/@target_alias@-gcov@exe_ext@
-%{_prefix}/bin/@target_alias@-gccbug@exe_ext@
+%{_prefix}/bin/@target_alias@-cpp%{_exeext}
+%{_prefix}/bin/@target_alias@-gcc%{_exeext}
+%{_prefix}/bin/@target_alias@-gcov%{_exeext}
+%{_prefix}/bin/@target_alias@-gccbug%{_exeext}
 %{_prefix}/@target_alias@/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 24abe938d0..4d2d34f56f 100644
--- a/scripts/gcc3newlib/target-gcj.add
+++ b/scripts/gcc3newlib/target-gcj.add
@@ -16,13 +16,13 @@ This is the gcc/java compiler for @target_alias@
 %files -n @target_alias@-gcj -f build/files.gcj
 %defattr(-,root,root)
 %dir %{_prefix}/bin
-%{_prefix}/bin/@target_alias@-gcj@exe_ext@
-%{_prefix}/bin/@target_alias@-jcf-dump@exe_ext@
-%{_prefix}/bin/@target_alias@-jv-scan@exe_ext@
-%{_prefix}/bin/@target_alias@-gcjh@exe_ext@
+%{_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}/lib/gcc-lib/@target_alias@/@gcc_version@/jc1@exe_ext@
-%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/jvgenmain@exe_ext@
+%{_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 3e2af9dc7b..313e5ac365 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@exe_ext@
+%{_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 9e87c8bc14..d2f7f5b699 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@exe_ext@
+%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/cc1obj%{_exeext}
 %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/include/objc
 %endif