From 2bdd6059b36ecba91bf49637050a5254c0016ed5 Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Sun, 19 Mar 2000 08:43:52 +0000
Subject: Upgrade to the 2000-03-13 GCC 2.96 development snapshot.

---
 lang/gcc-devel/Makefile       |  2 +-
 lang/gcc-devel/distinfo       | 10 +++++-----
 lang/gcc-devel/files/patch-fa | 42 +++++++++++++++++++++---------------------
 3 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'lang/gcc-devel')

diff --git a/lang/gcc-devel/Makefile b/lang/gcc-devel/Makefile
index 82d0af01249..99a99f8b70c 100644
--- a/lang/gcc-devel/Makefile
+++ b/lang/gcc-devel/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2000-03-06
+SNAPDATE=	2000-03-13
 SNAPVER=	${SNAPDATE:S/-//g}
 
 DISTNAME=	gcc-2.96
diff --git a/lang/gcc-devel/distinfo b/lang/gcc-devel/distinfo
index 639f31c6168..46132275519 100644
--- a/lang/gcc-devel/distinfo
+++ b/lang/gcc-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (egcs-core-20000306.tar.gz) = c5d5534b0dbbef56c7941f1203254251
-MD5 (egcs-g++-20000306.tar.gz) = 728ad3b320dfebda831baf8e94d31ee4
-MD5 (egcs-g77-20000306.tar.gz) = 21bdad63a06461ecae38a2ef67e4a8b9
-MD5 (egcs-java-20000306.tar.gz) = 3ce7f4d9cbacda593f2990b46713c567
-MD5 (egcs-objc-20000306.tar.gz) = 8e5bb944cb5e9311814b51a2bcd210c8
+MD5 (egcs-core-20000313.tar.gz) = cdbc7b66620af21ec41df37c8d707d19
+MD5 (egcs-g++-20000313.tar.gz) = c4ed3e278c6d8ff65217a13aa5e6cf39
+MD5 (egcs-g77-20000313.tar.gz) = 0eb21c1e7e30f0a262e6edd3a5e996f5
+MD5 (egcs-java-20000313.tar.gz) = c3a702114fbee4b01dbfa555d1f5c554
+MD5 (egcs-objc-20000313.tar.gz) = 5bdf7c5f038d91741b3577e6c2c78908
diff --git a/lang/gcc-devel/files/patch-fa b/lang/gcc-devel/files/patch-fa
index 984c773d8c1..ec6a579f554 100644
--- a/lang/gcc-devel/files/patch-fa
+++ b/lang/gcc-devel/files/patch-fa
@@ -1,6 +1,6 @@
---- gcc/c-common.c.orig	Mon Jan 24 12:10:00 2000
-+++ gcc/c-common.c	Tue Feb  1 02:43:39 2000
-@@ -152,7 +152,7 @@
+--- gcc/c-common.c.orig	Wed Mar  8 03:21:26 2000
++++ gcc/c-common.c	Tue Mar 14 21:46:03 2000
+@@ -154,7 +154,7 @@
  						 int, int, int));
  static void init_attributes		PARAMS ((void));
  static void record_function_format	PARAMS ((tree, tree, enum format_type,
@@ -9,15 +9,15 @@
  static void record_international_format	PARAMS ((tree, tree, int));
  static tree c_find_base_decl            PARAMS ((tree));
  static int default_valid_lang_attribute PARAMS ((tree, tree, tree, tree));
-@@ -812,6 +812,7 @@
- 	      = TREE_VALUE (TREE_CHAIN (TREE_CHAIN (args)));
- 	    int format_num;
- 	    int first_arg_num;
-+	    int null_format_ok;
+@@ -786,6 +786,7 @@
  	    enum format_type format_type;
  	    tree argument;
- 	    int arg_num;
-@@ -825,7 +826,7 @@
+ 	    unsigned int arg_num;
++	    int null_format_ok;
+ 
+ 	    if (TREE_CODE (decl) != FUNCTION_DECL)
+ 	      {
+@@ -796,7 +797,7 @@
  
  	    if (TREE_CODE (format_type_id) != IDENTIFIER_NODE)
  	      {
@@ -26,7 +26,7 @@
  		continue;
  	      }
  	    else
-@@ -833,12 +834,26 @@
+@@ -804,12 +805,26 @@
  		const char *p = IDENTIFIER_POINTER (format_type_id);
  
  		if (!strcmp (p, "printf") || !strcmp (p, "__printf__"))
@@ -53,7 +53,7 @@
  		else
  		  {
  		    warning ("`%s' is an unrecognized format function type", p);
-@@ -909,7 +924,8 @@
+@@ -882,7 +897,8 @@
  
  	    record_function_format (DECL_NAME (decl),
  				    DECL_ASSEMBLER_NAME (decl),
@@ -63,7 +63,7 @@
  	    break;
  	  }
  
-@@ -1213,6 +1229,11 @@
+@@ -1186,6 +1202,11 @@
  } format_char_info;
  
  static format_char_info print_char_table[] = {
@@ -75,7 +75,7 @@
    { "di",	0,	T_I,	T_I,	T_I,	T_L,	T_LL,	T_LL,	T_ST,	"-wp0 +"	},
    { "oxX",	0,	T_UI,	T_UI,	T_UI,	T_UL,	T_ULL,	T_ULL,	T_ST,	"-wp0#"		},
    { "u",	0,	T_UI,	T_UI,	T_UI,	T_UL,	T_ULL,	T_ULL,	T_ST,	"-wp0"		},
-@@ -1273,6 +1294,7 @@
+@@ -1246,6 +1267,7 @@
    tree name;			/* identifier such as "printf" */
    tree assembler_name;		/* optional mangled identifier (for C++) */
    enum format_type format_type;	/* type of format (printf, scanf, etc.) */
@@ -83,7 +83,7 @@
    int format_num;		/* number of format argument */
    int first_arg_num;		/* number of first arg (zero for varargs) */
  } function_format_info;
-@@ -1305,25 +1327,25 @@
+@@ -1278,25 +1300,25 @@
  init_function_format_info ()
  {
    record_function_format (get_identifier ("printf"), NULL_TREE,
@@ -119,7 +119,7 @@
  
    record_international_format (get_identifier ("gettext"), NULL_TREE, 1);
    record_international_format (get_identifier ("dgettext"), NULL_TREE, 2);
-@@ -1340,11 +1362,12 @@
+@@ -1313,11 +1335,12 @@
     (e.g. for varargs such as vfprintf).  */
  
  static void
@@ -133,7 +133,7 @@
        int format_num;
        int first_arg_num;
  {
-@@ -1368,6 +1391,7 @@
+@@ -1341,6 +1364,7 @@
      }
  
    info->format_type = format_type;
@@ -141,7 +141,7 @@
    info->format_num = format_num;
    info->first_arg_num = first_arg_num;
  }
-@@ -1521,7 +1545,8 @@
+@@ -1494,7 +1518,8 @@
  
    if (integer_zerop (format_tree))
      {
@@ -151,7 +151,7 @@
        return;
      }
    if (TREE_CODE (format_tree) != ADDR_EXPR)
-@@ -1710,12 +1735,13 @@
+@@ -1683,12 +1708,13 @@
  		     It will work on most machines, because size_t and int
  		     have the same mode.  But might as well warn anyway,
  		     since it will fail on other machines.  */
@@ -166,7 +166,7 @@
  		}
  	    }
  	  else
-@@ -1760,6 +1786,53 @@
+@@ -1733,6 +1759,53 @@
  		}
  	    }
  	}
@@ -220,7 +220,7 @@
  
        aflag = 0;
  
-@@ -1828,7 +1901,8 @@
+@@ -1801,7 +1874,8 @@
        switch (info->format_type)
  	{
  	case printf_format_type:
-- 
cgit