Add Fred's patch.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@20616 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 147 insertions, 0 deletions

diff --git a/gcc/README.gnat b/gcc/README.gnat
index 77e21c097e6..596273d6dd0 100644
--- a/gcc/README.gnat
+++ b/gcc/README.gnat
@@ -237,3 +237,150 @@ diff -c ada/a-tree.def /home/brolley/comp/egcs/tmp/ada/a-tree.def
   
 ! DEFTREECODE (GNAT_NOP_EXPR, "gnat_nop_expr", '1', 1)
 
+
+This patch from Fred Fish to GNAT may make building simpler.  We haven't
+tested it.
+
+> I put a very short blurb in the faq.  GNAT is complicated enough that
+> we should probably write a whole page on how to build/install it.
+
+You may want to use some or all of these patches:
+
+	* Make-lang.in (gnattools): Depends upon GCC_PARTS.
+	(ada.start.encap): Depends upon gnattools.
+	(ada.rest.encap): Depends upon gnatlib.
+	* Makefile.in (../stamp-gnatlib1): Since we are still in the rts
+	subdir when the rule runs, we need to touch ../../stamp-gnatlib1.
+	(../stamp-gnatlib1): Don't unconditionally remove the rts directory,
+	create it if one does not exist.
+	(gnatlib): Remove superflous leading blank char at *-*-pe line.
+	* a-init.c: Define NULL if not yet defined.
+
+Index: Make-lang.in
+===================================================================
+RCS file: /cvsroot/gg/egcs/gcc/ada/Make-lang.in,v
+retrieving revision 1.1.1.1
+retrieving revision 1.3
+diff -c -r1.1.1.1 -r1.3
+*** Make-lang.in	1997/10/17 06:19:09	1.1.1.1
+--- Make-lang.in	1998/03/17 14:26:14	1.3
+***************
+*** 100,106 ****
+  
+  # use host-gcc
+  # getopt*.o has to be built before CC=../xgcc
+! gnattools: getopt.o getopt1.o force
+  	$(MAKE) $(FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS)\
+  	   CC="../xgcc -B../" GNATBIND="../gnatbind" \
+  	   gnatf gnatlink gnatkr gnatmake gnatcmd gnatprep \
+--- 100,107 ----
+  
+  # use host-gcc
+  # getopt*.o has to be built before CC=../xgcc
+! # GCC_PARTS has to be built before CC=../xgcc
+! gnattools: getopt.o getopt1.o $(GCC_PARTS) force
+  	$(MAKE) $(FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS)\
+  	   CC="../xgcc -B../" GNATBIND="../gnatbind" \
+  	   gnatf gnatlink gnatkr gnatmake gnatcmd gnatprep \
+***************
+*** 163,170 ****
+  	-if [ -f gnatls$(exeext) ] ; then\
+  	  mv gnatls$(exeext)    gnatls-cross$(exeext); fi
+  
+! ada.start.encap:
+! ada.rest.encap:
+  ada.info:
+  ada.dvi:
+  
+--- 164,171 ----
+  	-if [ -f gnatls$(exeext) ] ; then\
+  	  mv gnatls$(exeext)    gnatls-cross$(exeext); fi
+  
+! ada.start.encap: gnattools
+! ada.rest.encap: gnatlib
+  ada.info:
+  ada.dvi:
+  
+Index: Makefile.in
+===================================================================
+RCS file: /cvsroot/gg/egcs/gcc/ada/Makefile.in,v
+retrieving revision 1.1.1.1
+retrieving revision 1.5
+diff -c -r1.1.1.1 -r1.5
+*** Makefile.in	1997/10/17 06:19:09	1.1.1.1
+--- Makefile.in	1998/02/19 14:16:34	1.5
+***************
+*** 798,806 ****
+     #  3. copy 3xyyy.ad[sb] -->-- i-yyy.ad[sb] 
+  
+  ../stamp-gnatlib1: Makefile ../stamp-gnatlib2
+! 	rm -rf rts
+! 	mkdir rts
+! 	chmod u+w rts
+  	(\
+  	   case $(target) in \
+  		sparc-sun-sunos4*) 	letter=u ;;\
+--- 800,806 ----
+     #  3. copy 3xyyy.ad[sb] -->-- i-yyy.ad[sb] 
+  
+  ../stamp-gnatlib1: Makefile ../stamp-gnatlib2
+! 	if [ -d rts ]; then true; else mkdir rts; chmod u+w rts; fi
+  	(\
+  	   case $(target) in \
+  		sparc-sun-sunos4*) 	letter=u ;;\
+***************
+*** 888,894 ****
+  		   done;; \
+  	   esac ; \
+  	   rm -f ../stamp-gnatlib ;  \
+! 	   touch ../stamp-gnatlib1)
+  
+  gnatlib-common: ../stamp-gnatlib1
+  	(subdir=`cd $(srcdir); pwd`; \
+--- 888,894 ----
+  		   done;; \
+  	   esac ; \
+  	   rm -f ../stamp-gnatlib ;  \
+! 	   touch ../../stamp-gnatlib1)
+  
+  gnatlib-common: ../stamp-gnatlib1
+  	(subdir=`cd $(srcdir); pwd`; \
+***************
+*** 923,929 ****
+  		mips-sni-*	       |\
+  		*-*-cygwin32*          |\
+  		*-*-mingw32*           |\
+!  		*-*-pe                 |\
+                  *)		       \
+                  \
+  		 $(MAKE)  CC="../../xgcc -B../../" \
+--- 923,929 ----
+  		mips-sni-*	       |\
+  		*-*-cygwin32*          |\
+  		*-*-mingw32*           |\
+! 		*-*-pe                 |\
+                  *)		       \
+                  \
+  		 $(MAKE)  CC="../../xgcc -B../../" \
+Index: a-init.c
+===================================================================
+RCS file: /cvsroot/gg/egcs/gcc/ada/a-init.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -c -r1.1.1.1 -r1.2
+*** a-init.c	1997/10/17 06:19:10	1.1.1.1
+--- a-init.c	1998/01/04 23:11:42	1.2
+***************
+*** 516,521 ****
+--- 516,525 ----
+    __gnat_raise (exception);
+  }
+  
++ #ifndef NULL
++ #define NULL 0
++ #endif
++ 
+  static void
+  __gnat_install_handler ()
+  {
+