Update to version 3.14p

PR: 34670
Submitted by: Joe Marcus Clarke <marcus@marcuscom.com>

4 files changed, 82 insertions, 72 deletions

diff --git a/lang/gnat/files/patch-ac b/lang/gnat/files/patch-ac
index 966caf1dd517..4c6d040f1aff 100644
--- a/lang/gnat/files/patch-ac
+++ b/lang/gnat/files/patch-ac
@@ -1,49 +1,37 @@
-*** ada/Makefile.in.orig	Wed Jul 19 15:08:56 2000
---- ada/Makefile.in	Sun Oct 15 01:09:35 2000
-***************
-*** 976,981 ****
---- 976,1002 ----
-    endif
-  endif
-  
-+ ifeq ($(strip $(filter-out %86 freebsd%,$(arch) $(osys))),)
-+   LIBGNAT_TARGET_PAIRS = \
-+   a-intnam.ads<4fintnam.ads \
-+   s-inmaop.adb<7sinmaop.adb \
-+   s-intman.adb<5fintman.adb \
-+   s-mastop.adb<5omastop.adb \
-+   s-osinte.adb<5fosinte.adb \
-+   s-osinte.ads<5fosinte.ads \
-+   s-osprim.adb<7sosprim.adb \
-+   s-taprop.adb<5ftaprop.adb \
-+   s-taspri.ads<7staspri.ads \
-+   s-tpopsp.adb<7stpopsp.adb \
-+   s-traceb.adb<5wtraceb.adb \
-+   system.ads<5fsystem.ads
-+ 
-+   threadslib=
-+   LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
-+   SHARED_MAJOR = 1
-+   soext = .so.$(SHARED_MAJOR)
-+ endif
-+ 
-  ifeq ($(strip $(filter-out mips sgi irix%,$(targ))),)
-    ifeq ($(strip $(filter-out mips sgi irix6%,$(targ))),)
-      LIBGNAT_TARGET_PAIRS = \
-***************
-*** 1818,1824 ****
-  		$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) $(misclib) -lm
-  	cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
-  		-o libgnarl-$(LIBRARY_VERSION)$(soext) $(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) \
-! 		$(GNATRTL_TASKING_OBJS) -l$(threadslib)
-  
-  gnatlib-shared-dual:
-  	$(MAKE) $(FLAGS_TO_PASS) \
---- 1839,1845 ----
-  		$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) $(misclib) -lm
-  	cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
-  		-o libgnarl-$(LIBRARY_VERSION)$(soext) $(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) \
-! 		$(GNATRTL_TASKING_OBJS) $(threadslib)
-  
-  gnatlib-shared-dual:
-  	$(MAKE) $(FLAGS_TO_PASS) \
+--- ada/Makefile.in.orig	Thu May  3 07:01:07 2001
++++ ada/Makefile.in	Mon Feb  4 13:15:17 2002
+@@ -1109,6 +1109,25 @@
+ 	$(CC) -c $(CFLAGS) -gnatpg $(ADA_INCLUDES) $<
+ endif
+ 
++ifeq ($(strip $(filter-out %86 freebsd%,$(arch) $(osys))),)
++    LIBGNAT_TARGET_PAIRS = \
++    a-intnam.ads<4fintnam.ads \
++    s-inmaop.adb<7sinmaop.adb \
++    s-intman.adb<5fintman.adb \
++    s-mastop.adb<5omastop.adb \
++    s-osinte.adb<5fosinte.adb \
++    s-osinte.ads<5fosinte.ads \
++    s-osprim.adb<7sosprim.adb \
++    s-taprop.adb<5ftaprop.adb \
++    s-taspri.ads<7staspri.ads \
++    s-tpopsp.adb<7stpopsp.adb \
++    system.ads<5fsystem.ads
++
++    SHARED_MAJOR = 1
++    soext = .so.$(SHARED_MAJOR)
++    LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
++endif
++
+ ifeq ($(strip $(filter-out mips sgi irix%,$(targ))),)
+   ifeq ($(strip $(filter-out mips sgi irix6%,$(targ))),)
+     LIBGNAT_TARGET_PAIRS = \
+@@ -1997,7 +2016,7 @@
+ 		$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) $(misclib) -lm
+ 	cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
+ 		-o libgnarl-$(LIBRARY_VERSION)$(soext) $(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) \
+-		$(GNATRTL_TASKING_OBJS) -l$(threadslib)
++		$(GNATRTL_TASKING_OBJS) $(threadslib)
+ 	cd rts; $(LN) libgnat-$(LIBRARY_VERSION)$(soext) libgnat$(soext)
+ 	cd rts; $(LN) libgnarl-$(LIBRARY_VERSION)$(soext) libgnarl$(soext)
+ 
diff --git a/lang/gnat/files/patch-ah b/lang/gnat/files/patch-ah
index 10b3eae32453..1cfe0c40d75b 100644
--- a/lang/gnat/files/patch-ah
+++ b/lang/gnat/files/patch-ah
@@ -1,19 +1,11 @@
-*** ./ada/a-cstrea.c.orig	Fri Sep 24 08:42:07 1999
---- ./ada/a-cstrea.c	Sat Nov  6 16:06:52 1999
-***************
-*** 198,204 ****
-     _fixpath (nam, buffer);
-  
-  #else
-! #if defined (sgi) || defined (sun) || defined (linux)
-  
-     /* Use realpath function which resolves links and references to .. and ..
-        on those Unix systems that support it. */
---- 198,204 ----
-     _fixpath (nam, buffer);
-  
-  #else
-! #if defined (sgi) || defined (sun) || defined (linux) || defined (__FreeBSD__)
-  
-     /* Use realpath function which resolves links and references to .. and ..
-        on those Unix systems that support it. */
+--- ada/a-cstrea.c.orig	Fri Feb  1 22:59:35 2002
++++ ada/a-cstrea.c	Fri Feb  1 23:03:11 2002
+@@ -205,7 +205,7 @@
+ #elif defined (MSDOS)
+   _fixpath (nam, buffer);
+ 
+-#elif defined (sgi)
++#elif defined (sgi) || defined (__FreeBSD__)
+ 
+   /* Use realpath function which resolves links and references to .. and ..
+      on those Unix systems that support it. Note that linux provides it but
diff --git a/lang/gnat/files/patch-am b/lang/gnat/files/patch-am
index 20093d20bfec..ae8b2a9db558 100644
--- a/lang/gnat/files/patch-am
+++ b/lang/gnat/files/patch-am
@@ -1,6 +1,6 @@
---- ada/g-os_lib.adb.orig	Wed Jul 19 15:09:39 2000
-+++ ada/g-os_lib.adb	Fri Oct 13 09:09:33 2000
-@@ -173,25 +173,12 @@
+--- ada/g-os_lib.adb.orig	Fri Feb  1 23:18:26 2002
++++ ada/g-os_lib.adb	Fri Feb  1 23:22:08 2002
+@@ -192,26 +192,13 @@
       (FD   : out File_Descriptor;
        Name : out Temp_File_Name)
     is
@@ -16,7 +16,8 @@
 +      pragma Import (C, Open_New_Temp, "mkstemp");
  
     begin
-       Name := "GNAT-XXXXXX" & ASCII.NUL;
+       Name (1 .. Temp_File_Len - 1) := "GNAT-XXXXXX";
+       Name (Temp_File_Len)          := ASCII.NUL;
 -
 -      --  Check for NULL pointer returned by C
 -
diff --git a/lang/gnat/files/patch-ao b/lang/gnat/files/patch-ao
new file mode 100644
index 000000000000..5ad4ff0b5afe
--- /dev/null
+++ b/lang/gnat/files/patch-ao
@@ -0,0 +1,29 @@
+--- ../gnat-3.14p-src/examples/Makefile	Tue Jan 30 18:00:05 2001
++++ ../gnat-3.14p-src/examples/Makefile.new	Mon Feb  4 15:01:55 2002
+@@ -6,10 +6,10 @@
+ CC = gcc
+ 
+ # the Ada Compiler
+-ADAC = $(CC)
++ADAC = adagcc
+ 
+ # the C++ compiler
+-CPLUSPLUS = c++
++CPLUSPLUS = g++
+ 
+ # Gnat1 compilation flags
+ GF = -O2
+@@ -32,9 +32,10 @@
+   demo1$e           \
+   demo2$e           \
+   test_cl$e         \
+-  diners$e          \
+-  ex6_main          \
+-  cpp_main
++  diners$e
++# \  C++ not built into FreeBSD GNAT
++#  ex6_main$e       \
++#  cpp_main$e
+ 
+ 
+ #-----------------------------------------------------------------------------