From d35ed74a1d8ef19f44c3416ce45037434fd4f6b1 Mon Sep 17 00:00:00 2001 From: joerg Date: Tue, 12 Oct 2010 22:57:55 +0000 Subject: At least try to compile with newer GCC. --- lang/gcc/Makefile | 4 ++-- lang/gcc/distinfo | 7 ++++++- lang/gcc/patches/patch-ai | 20 ++++++++++++++++++++ lang/gcc/patches/patch-aj | 13 +++++++++++++ lang/gcc/patches/patch-ak | 13 +++++++++++++ lang/gcc/patches/patch-al | 13 +++++++++++++ lang/gcc/patches/patch-am | 20 ++++++++++++++++++++ 7 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 lang/gcc/patches/patch-ai create mode 100644 lang/gcc/patches/patch-aj create mode 100644 lang/gcc/patches/patch-ak create mode 100644 lang/gcc/patches/patch-al create mode 100644 lang/gcc/patches/patch-am (limited to 'lang/gcc') diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index f6a7d18238c..194f0967301 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.93 2009/09/20 14:41:52 schwarz Exp $ +# $NetBSD: Makefile,v 1.94 2010/10/12 22:57:55 joerg Exp $ DISTNAME= gcc-2.95.3 PKGREVISION= 7 @@ -17,7 +17,7 @@ COMMENT= GNU Compiler Collection, version 2 NOT_FOR_PLATFORM= Darwin-*-* Interix-*-* *-*-x86_64 DragonFly-*-* -USE_TOOLS+= gmake +USE_TOOLS+= gmake bison MAKEFLAGS+= GMAKE_LOCALE=no HAS_CONFIGURE= YES diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo index 2eca9cd8bf1..8793019b2ec 100644 --- a/lang/gcc/distinfo +++ b/lang/gcc/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2005/02/24 09:03:07 agc Exp $ +$NetBSD: distinfo,v 1.24 2010/10/12 22:57:55 joerg Exp $ SHA1 (gcc-2.95.3.tar.gz) = 535d27038d161c0e7c2662702e11a48aa97ef622 RMD160 (gcc-2.95.3.tar.gz) = 2c506b7e80cb2b4d9953f4f9753d581cb885f610 @@ -14,3 +14,8 @@ SHA1 (patch-ae) = b9721d3e89a93736b926e1efcfb9d0fb4904277f SHA1 (patch-af) = 72d27bfecb2633a1f184cfe9cc8b1194c0d57dfe SHA1 (patch-ag) = bb4d84561d20d2379a71a442b8711b2c54cf4bf2 SHA1 (patch-ah) = 777b4c19c7d86007c69ec9b8c157c73294695241 +SHA1 (patch-ai) = ce25852c0694163b3e880a700304e56edbc9069d +SHA1 (patch-aj) = 9c957c4e61b67efdb92796fe04e22931cb103b5d +SHA1 (patch-ak) = cf546c843a3370220360c01b7c7b09365ac1b506 +SHA1 (patch-al) = 4ac1f94d5f12d4419fe7d92f5e3c9aa3b3158a33 +SHA1 (patch-am) = bc18d2055d5af97d648a04af8c89be2627db700b diff --git a/lang/gcc/patches/patch-ai b/lang/gcc/patches/patch-ai new file mode 100644 index 00000000000..4c689a28877 --- /dev/null +++ b/lang/gcc/patches/patch-ai @@ -0,0 +1,20 @@ +$NetBSD: patch-ai,v 1.5 2010/10/12 22:57:56 joerg Exp $ + +--- gcc/java/parse.y.orig 2010-10-12 22:33:34.000000000 +0000 ++++ gcc/java/parse.y +@@ -10164,6 +10164,7 @@ resolve_type_during_patch (type) + } + /* 5.5 Casting Conversion. error_mark_node is returned if an error is + found. Otherwise NODE or something meant to replace it is returned. */ ++static tree convert_narrow (); + + static tree + patch_cast (node, wfl_operator) +@@ -10182,7 +10183,6 @@ patch_cast (node, wfl_operator) + /* Check on cast that are proven correct at compile time */ + if (JNUMERIC_TYPE_P (cast_type) && JNUMERIC_TYPE_P (op_type)) + { +- static tree convert_narrow (); + /* Same type */ + if (cast_type == op_type) + return node; diff --git a/lang/gcc/patches/patch-aj b/lang/gcc/patches/patch-aj new file mode 100644 index 00000000000..a2190852b68 --- /dev/null +++ b/lang/gcc/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.5 2010/10/12 22:57:56 joerg Exp $ + +--- gcc/f/com.c.orig 2010-10-12 22:37:49.000000000 +0000 ++++ gcc/f/com.c +@@ -11539,7 +11539,7 @@ ffecom_get_invented_identifier (const ch + return decl; + } + +-ffeinfoBasictype ++ffeinfoKindtype + ffecom_gfrt_basictype (ffecomGfrt gfrt) + { + assert (gfrt < FFECOM_gfrt); diff --git a/lang/gcc/patches/patch-ak b/lang/gcc/patches/patch-ak new file mode 100644 index 00000000000..ede39ac1a83 --- /dev/null +++ b/lang/gcc/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.5 2010/10/12 22:57:56 joerg Exp $ + +--- gcc/ch/decl.c.orig 2010-10-12 22:41:57.000000000 +0000 ++++ gcc/ch/decl.c +@@ -4446,7 +4446,7 @@ complete_array_type (type, initial_value + + tree + start_struct (code, name) +- enum chill_tree_code code; ++ enum tree_code code; + tree name ATTRIBUTE_UNUSED; + { + /* If there is already a tag defined at this binding level diff --git a/lang/gcc/patches/patch-al b/lang/gcc/patches/patch-al new file mode 100644 index 00000000000..f5585ae66a4 --- /dev/null +++ b/lang/gcc/patches/patch-al @@ -0,0 +1,13 @@ +$NetBSD: patch-al,v 1.8 2010/10/12 22:57:56 joerg Exp $ + +--- gcc/ch/expr.c.orig 2010-10-12 22:47:21.000000000 +0000 ++++ gcc/ch/expr.c +@@ -3490,7 +3490,7 @@ compare_records (exp0, exp1) + + int + compare_int_csts (op, val1, val2) +- enum tree_code op; ++ enum chill_tree_code op; + tree val1, val2; + { + int result; diff --git a/lang/gcc/patches/patch-am b/lang/gcc/patches/patch-am new file mode 100644 index 00000000000..bb399368dcb --- /dev/null +++ b/lang/gcc/patches/patch-am @@ -0,0 +1,20 @@ +$NetBSD: patch-am,v 1.5 2010/10/12 22:57:56 joerg Exp $ + +--- gcc/java/parse.c.orig 2001-03-16 14:13:48.000000000 +0000 ++++ gcc/java/parse.c +@@ -12818,6 +12818,7 @@ resolve_type_during_patch (type) + } + /* 5.5 Casting Conversion. error_mark_node is returned if an error is + found. Otherwise NODE or something meant to replace it is returned. */ ++static tree convert_narrow (); + + static tree + patch_cast (node, wfl_operator) +@@ -12836,7 +12837,6 @@ patch_cast (node, wfl_operator) + /* Check on cast that are proven correct at compile time */ + if (JNUMERIC_TYPE_P (cast_type) && JNUMERIC_TYPE_P (op_type)) + { +- static tree convert_narrow (); + /* Same type */ + if (cast_type == op_type) + return node; -- cgit v1.2.3