2005-04-29 Ralf Corsepius <ralf.corsepius@rtems.org>

	* gccnewlib/base-gnat.add, gccnewlib/gccnewlib.add,
	gccnewlib/target-gnat.add: Abandon Gnat for gcc < 4.0

4 files changed, 6 insertions, 46 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index df80e060b9..6c5f49d263 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-29	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* gccnewlib/base-gnat.add, gccnewlib/gccnewlib.add,
+	gccnewlib/target-gnat.add: Abandon Gnat for gcc < 4.0
+
 2005-04-27	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* gccnewlib/base-gfortran.add: Fix broken install-info.
diff --git a/scripts/gccnewlib/base-gnat.add b/scripts/gccnewlib/base-gnat.add
index 89c5f4eea7..a872784fe2 100644
--- a/scripts/gccnewlib/base-gnat.add
+++ b/scripts/gccnewlib/base-gnat.add
@@ -16,16 +16,12 @@ This is the gcc/gnat tools for the gcc/gnat compiler
 
 %files -n %{rpmprefix}rtems@osversion@-base-gnat
 %defattr(-,root,root)
-%if "%{gcc_version}" >= "4.0"
 %dir %{_bindir}
 %{_bindir}/vxaddr2line%{_exeext}
-%endif
 
-%if "%{gcc_version}" >= "3.3"
+%dir %{_infodir}
 %{_infodir}/gnat*
-%endif
 
-%if "%{gcc_version}" >= "3.3"
 %post -n %{rpmprefix}rtems@osversion@-base-gnat
   /sbin/install-info --infodir=%{_infodir} %{_infodir}/gnat_rm.info.gz
   /sbin/install-info --infodir=%{_infodir} %{_infodir}/gnat-style.info.gz
@@ -38,4 +34,3 @@ if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gnat_ugn_unw.info.gz
 fi
 %endif
-%endif
diff --git a/scripts/gccnewlib/gccnewlib.add b/scripts/gccnewlib/gccnewlib.add
index fc8d540c02..e05bc1d578 100644
--- a/scripts/gccnewlib/gccnewlib.add
+++ b/scripts/gccnewlib/gccnewlib.add
@@ -213,44 +213,7 @@ cd ..
   cp ../gcc-%{gcc_version}/gcc/gsyslimits.h gcc/include/syslimits.h
 %endif
 
-%if %build_gnat
-%if "%{gcc_version}" < "3.4"
-  cd ../gcc-%{gcc_version}/gcc/ada
-  touch treeprs.ads [es]info.h nmake.ad[bs]
-  cd ../../../build
-%endif
-%endif
-
   make all
-%if %build_gnat
-# This gnat configuration is crap :(
-
-%if "%{gcc_version}" >= "3.4"
-# This is what is documented - Of cause it doesn't work.
-  make -C gcc gnatlib
-  make -C gcc cross-gnattools
-  make -C gcc ada.all.cross
-%endif
-
-%if "%{gcc_version}" < "3.4"
-# This is what had worked for some versions of gcc.
-  make -C gcc cross-gnattools
-  make -C gcc ada.all.cross
-# This is what gcc/ada/Makefile.in contains by default, 
-# but what we override below
-  GNATLIBCFLAGS="-g -O2"
-# Let gnatlib building find newlib's headers
-  GNATLIBCFLAGS="$GNATLIBCFLAGS -isystem `pwd`/%{gcc_target}/newlib/targ-include"
-  GNATLIBCFLAGS="$GNATLIBCFLAGS -isystem `pwd`/../newlib-%{newlib_version}/newlib/libc/include"
-  GNATLIBCFLAGS="$GNATLIBCFLAGS -isystem `pwd`/../gcc-%{gcc_version}/include"
-# Without this xgcc doesn't find the target's binutils.
-  GNATLIBCFLAGS="$GNATLIBCFLAGS -B%{_prefix}/%{gcc_target}/bin/"
-%if "%{gcc_target}" == "mips-rtems@osversion@"
-  GNATLIBCFLAGS="$GNATLIBCFLAGS -G0"
-%endif
-  make -C gcc GNATLIBCFLAGS="${GNATLIBCFLAGS}" gnatlib
-%endif
-%endif
   make info
 
 %install
diff --git a/scripts/gccnewlib/target-gnat.add b/scripts/gccnewlib/target-gnat.add
index b341cc603f..2062e70699 100644
--- a/scripts/gccnewlib/target-gnat.add
+++ b/scripts/gccnewlib/target-gnat.add
@@ -16,10 +16,7 @@ This is the gcc/gnat compiler for %{gcc_target}
 %defattr(-,root,root)
 %dir %{_bindir}
 %{_bindir}/%{gcc_target}-gnat*
-
-%if "%{gcc_version}" >= "4.0"
 %{_bindir}/%{gcc_target}-gprmake%{_exeext}
-%endif
 
 %{gccexec}/%{gcc_target}/%{gcc_version}/gnat1%{_exeext}
 %{gcclib}/%{gcc_target}/%{gcc_version}/adalib