As proposed at pkgsrc-users@,

  (1) nios2-gcc       3.4.6 renamed to nios2-gcc3
  (2) nios2-binutils  2.20  renamed to nios2-bintuils220
  (3) nios2-gcc41     4.1.2 is imported from wip
  nios2/Makefile.common, used be for (1) and (2) are
  now for (2) and (3).

2 files changed, 85 insertions, 0 deletions

diff --git a/cross/nios2-gcc3/patches/patch-aa b/cross/nios2-gcc3/patches/patch-aa
new file mode 100644
index 00000000000..78656f50c68
--- /dev/null
+++ b/cross/nios2-gcc3/patches/patch-aa
@@ -0,0 +1,33 @@
+$NetBSD: patch-aa,v 1.1 2013/11/16 07:41:00 mef Exp $
+#
+# craft FPBIT_FUNCS and DPBIT_FUNCS lists to avoid routine collision
+# against NetBSD softfloat implementation. Following twelve are to
+# be eliminated;
+#	_addsub_df.o _addsub_sf.o _df_to_sf.o _df_to_si.o
+#	_div_df.o _div_sf.o _mul_df.o _mul_sf.o _sf_to_df.o _sf_to_si.o
+#	_si_to_df.o _si_to_sf.o
+
+--- gcc/Makefile.in.orig	2010-08-31 07:47:29.000000000 +0900
++++ gcc/Makefile.in	2010-11-24 10:42:04.000000000 +0900
+@@ -912,15 +912,15 @@
+ # Defined in libgcov.c, included only in gcov library
+ LIBGCOV = _gcov _gcov_merge_add _gcov_merge_single _gcov_merge_delta
+ 
+-FPBIT_FUNCS = _pack_sf _unpack_sf _addsub_sf _mul_sf _div_sf \
++FPBIT_FUNCS = _pack_sf _unpack_sf \
+     _fpcmp_parts_sf _compare_sf _eq_sf _ne_sf _gt_sf _ge_sf \
+-    _lt_sf _le_sf _unord_sf _si_to_sf _sf_to_si _negate_sf _make_sf \
+-    _sf_to_df _sf_to_tf _thenan_sf _sf_to_usi _usi_to_sf
++    _lt_sf _le_sf _unord_sf 	                _negate_sf _make_sf \
++    _sf_to_tf           _thenan_sf _sf_to_usi _usi_to_sf
+ 
+-DPBIT_FUNCS = _pack_df _unpack_df _addsub_df _mul_df _div_df \
++DPBIT_FUNCS = _pack_df _unpack_df \
+     _fpcmp_parts_df _compare_df _eq_df _ne_df _gt_df _ge_df \
+-    _lt_df _le_df _unord_df _si_to_df _df_to_si _negate_df _make_df \
+-    _df_to_sf _df_to_tf _thenan_df _df_to_usi _usi_to_df
++    _lt_df _le_df _unord_df 	                 negate_df _make_df \
++    _df_to_tf           _thenan_df _df_to_usi _usi_to_df
+ 
+ TPBIT_FUNCS = _pack_tf _unpack_tf _addsub_tf _mul_tf _div_tf \
+     _fpcmp_parts_tf _compare_tf _eq_tf _ne_tf _gt_tf _ge_tf \
diff --git a/cross/nios2-gcc3/patches/patch-ab b/cross/nios2-gcc3/patches/patch-ab
new file mode 100644
index 00000000000..607e9a3820f
--- /dev/null
+++ b/cross/nios2-gcc3/patches/patch-ab
@@ -0,0 +1,52 @@
+$NetBSD: patch-ab,v 1.1 2013/11/16 07:41:00 mef Exp $
+
+Based on the suggenstion from TNT (www.trans-nt.com)
+Thanks locore64 (at) alkyltechnology.com for the info.
+
+--- gcc/c-parse.y.orig	2006-03-06 12:57:18.000000000 +0900
++++ gcc/c-parse.y	2010-11-24 12:10:18.000000000 +0900
+@@ -1647,34 +1647,34 @@
+ 
+ structsp_attr:
+ 	  struct_head identifier '{'
+-		{ $$ = start_struct (RECORD_TYPE, $2);
++		{ $<ttype>$ = start_struct (RECORD_TYPE, $2);
+ 		  /* Start scope of tag before parsing components.  */
+ 		}
+ 	  component_decl_list '}' maybe_attribute
+-		{ $$ = finish_struct ($<ttype>4, nreverse ($5),
++		{ $<ttype>$ = finish_struct ($<ttype>4, nreverse ($5),
+ 				      chainon ($1, $7)); }
+ 	| struct_head '{' component_decl_list '}' maybe_attribute
+-		{ $$ = finish_struct (start_struct (RECORD_TYPE, NULL_TREE),
++		{ $<ttype>$ = finish_struct (start_struct (RECORD_TYPE, NULL_TREE),
+ 				      nreverse ($3), chainon ($1, $5));
+ 		}
+ 	| union_head identifier '{'
+-		{ $$ = start_struct (UNION_TYPE, $2); }
++		{ $<ttype>$ = start_struct (UNION_TYPE, $2); }
+ 	  component_decl_list '}' maybe_attribute
+-		{ $$ = finish_struct ($<ttype>4, nreverse ($5),
++		{ $<ttype>$ = finish_struct ($<ttype>4, nreverse ($5),
+ 				      chainon ($1, $7)); }
+ 	| union_head '{' component_decl_list '}' maybe_attribute
+-		{ $$ = finish_struct (start_struct (UNION_TYPE, NULL_TREE),
++		{ $<ttype>$ = finish_struct (start_struct (UNION_TYPE, NULL_TREE),
+ 				      nreverse ($3), chainon ($1, $5));
+ 		}
+ 	| enum_head identifier '{'
+-		{ $$ = start_enum ($2); }
++		{ $<ttype>$ = start_enum ($2); }
+ 	  enumlist maybecomma_warn '}' maybe_attribute
+-		{ $$ = finish_enum ($<ttype>4, nreverse ($5),
++		{ $<ttype>$ = finish_enum ($<ttype>4, nreverse ($5),
+ 				    chainon ($1, $8)); }
+ 	| enum_head '{'
+-		{ $$ = start_enum (NULL_TREE); }
++		{ $<ttype>$ = start_enum (NULL_TREE); }
+ 	  enumlist maybecomma_warn '}' maybe_attribute
+-		{ $$ = finish_enum ($<ttype>3, nreverse ($4),
++		{ $<ttype>$ = finish_enum ($<ttype>3, nreverse ($4),
+ 				    chainon ($1, $7)); }
+ 	;
+