From 61f41e2207dc42773c830512344636db022b21de Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Mon, 17 Nov 2003 12:52:01 +0000
Subject: 2003-11-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* gcc3newlib/gccnewlib.add: Add hacks to make gnatlib
	buildable.
	* gcc3newlib/base-gnat.add: Add info files.
---
 scripts/ChangeLog                |  6 ++++++
 scripts/gcc3newlib/base-gnat.add | 27 ++++++++++++++++++++++++++-
 scripts/gcc3newlib/gccnewlib.add | 17 +++++++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index e5b15bc03c..43135e95f6 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* gcc3newlib/gccnewlib.add: Add hacks to make gnatlib
+	buildable.
+	* gcc3newlib/base-gnat.add: Add info files.
+
 2003-10-30	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* gcc3newlib/gccnewlib.add: Make not building gnat and gcj the
diff --git a/scripts/gcc3newlib/base-gnat.add b/scripts/gcc3newlib/base-gnat.add
index 090d187615..581426722f 100644
--- a/scripts/gcc3newlib/base-gnat.add
+++ b/scripts/gcc3newlib/base-gnat.add
@@ -14,5 +14,30 @@ This is the gcc/gnat tools for the gcc/gnat compiler
 %files -n %{rpmprefix}rtems@osversion@-base-gnat
 %defattr(-,root,root)
 %dir %{_prefix}/bin
-# %{_prefix}/bin/gnat*
+
+%if "%{gcc_version}" >= "3.3"
+%{_prefix}/info/gnat*
+%endif
+
+%if "%{gcc_version}" >= "3.3"
+%post -n %{rpmprefix}rtems@osversion@-base-gnat
+  if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
+  then
+    rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
+    f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
+    test -n "$f" && for i in $f; do
+      install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
+    done
+  fi
+
+%postun -n %{rpmprefix}rtems@osversion@-base-gnat
+  if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
+  then
+    rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
+    f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
+    test -n "$f" && for i in $f; do
+      install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
+    done
+  fi
+%endif
 %endif
diff --git a/scripts/gcc3newlib/gccnewlib.add b/scripts/gcc3newlib/gccnewlib.add
index bfa8590ba7..2e5e3fb1a2 100644
--- a/scripts/gcc3newlib/gccnewlib.add
+++ b/scripts/gcc3newlib/gccnewlib.add
@@ -217,12 +217,29 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
 # This should work, but doesn't.
 #  make -C gcc gnatlib 
 
+%if "%{gcc_version}" >= "3.3"
+# gcc >= 3.3
+  rm -rf gnatlib
+  mkdir gnatlib
+  pushd gnatlib
+  ACC="../gcc/xgcc -B../gcc/ -B../%{gcc_target}/newlib/"
+  ACC="$ACC -isystem ../%{gcc_target}/newlib/targ-include"
+  ACC="$ACC -isystem ../../newlib-%{newlib_version}/newlib/libc/include"
+  CC="$ACC" ../../gcc-%{gcc_version}/gcc/configure --disable-nls \
+     --host=%{gcc_target} --target=%{gcc_target} --enable-languages=ada
+  popd
+  make -C gcc/ada ../stamp-gnatlib1 LN_S="ln -s"
+  rm -f gcc/ada/rts/auto-target.h gcc/ada/rts/config.h
+  cp gnatlib/auto-host.h gcc/ada/rts/auto-target.h
+  sed -e 's,auto-host,auto-target,' < gcc/config.h > gcc/ada/rts/config.h
+%endif
 # 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@"
-- 
cgit v1.2.3