As proposed in following mail:

  http://mail-index.netbsd.org/pkgsrc-users/2013/11/16/msg018897.html

(1) Import nios2-binutils 2.23 (CodeSourcery derived) from wip.
(2) nios2-gcc41 now does not include nios2/Makefile.common,
    and unnecessary buildlink3 line to kpathsea removed.
(3) Switch nios2/Makefile.common to provide above (1) package.
(4) Import nios2-gcc 4.7.3 (CodeSourcery derived) from wip,
   including file (3) nios2/Makefile.common and DEPENDS (1) binutils.
(5) Switch all gcc's, nios2-gcc{3,41} to DEPENDS above (1) binutils.
(6) Delete nios2-binutils220 (2.20).

6 files changed, 366 insertions, 0 deletions

diff --git a/cross/nios2-binutils/DESCR b/cross/nios2-binutils/DESCR
new file mode 100644
index 00000000000..1071554d8bc
--- /dev/null
+++ b/cross/nios2-binutils/DESCR
@@ -0,0 +1 @@
+Cross binutils 2.23 for ALTERA FPGA Nios2 processor.
diff --git a/cross/nios2-binutils/Makefile b/cross/nios2-binutils/Makefile
new file mode 100644
index 00000000000..dac90ae6fcb
--- /dev/null
+++ b/cross/nios2-binutils/Makefile
@@ -0,0 +1,50 @@
+# $NetBSD: Makefile,v 1.3 2013/11/18 06:41:27 mef Exp $
+.include		"../../cross/nios2/Makefile.common"
+PKGNAME=		nios2-binutils-${PKG_VERSION}
+PKG_VERSION=		2.23
+
+MAINTAINER=		pkgsrc-users@NetBSD.org
+#HOMEPAGE=
+COMMENT=		GNU binutils for Altera FPGA Nios2 processor
+LICENSE=		gnu-gpl-v3
+
+GNU_CONFIGURE=		yes
+USE_PKGLOCALEDIR=	yes
+WRKSRC=			${WRKDIR}/binutils-2013.05
+
+USE_TOOLS+=		ksh gettext gmake makeinfo perl tar automake autoconf gawk
+USE_LIBTOOL=		yes
+USE_LANGUAGES+=		c c++
+BUILD_DEFS+=		${NIOS_INFO_DIR}
+
+CONFIGURE_ARGS+=	--disable-nls
+# install libiberty by architecture
+CONFIGURE_ARGS+=	--libdir=${PREFIX}/${NIOS2_TARGET}/lib
+
+# To avoid conflict with other cross/native info files,
+NIOS_INFO_DIR=		${PREFIX}/info/${NIOS2_TARGET}
+.include "../../mk/bsd.prefs.mk"
+INFO_DIR?=		${NIOS_INFO_DIR}
+
+# CONFIGURE_ARGS+=	--infodir=
+#  doesn't make it, will be overridden by following variables
+#  see mk/configure/gnu-configure.mk
+GNU_CONFIGURE_INFODIR=	${NIOS_INFO_DIR}
+
+do-extract:
+	(cd ${WRKDIR}; tar zxf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}	\
+	        sourceryg++-2013.05-43-nios2-linux-gnu/binutils-2013.05-43.tar.bz2;\
+	tar zxf sourceryg++-2013.05-43-nios2-linux-gnu/binutils-2013.05-43.tar.bz2;\
+	)
+
+# following file installed is reference only, not used at all for the moment
+post-install:
+	${INSTALL_DATA} files/nios2elf-netbsd.x ${DESTDIR}${PREFIX}/${NIOS2_TARGET}/lib/ldscripts
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
+CONFIGURE_ENV+=		PATH=${CROSSBASE}/bin:${PATH}
+
+# ./configure.lineno: 3238: Syntax error: "else" unexpected
+#  gmake[1]: *** [configure-gas] Error 1
+PKGSRC_MAKE_ENV+=	SH=/bin/ksh
diff --git a/cross/nios2-binutils/PLIST b/cross/nios2-binutils/PLIST
new file mode 100644
index 00000000000..6c89b58abff
--- /dev/null
+++ b/cross/nios2-binutils/PLIST
@@ -0,0 +1,67 @@
+@comment $NetBSD: PLIST,v 1.3 2013/11/18 06:41:27 mef Exp $
+${NIOS2_TARGET}/bin/ar
+${NIOS2_TARGET}/bin/as
+${NIOS2_TARGET}/bin/ld
+${NIOS2_TARGET}/bin/ld.bfd
+${NIOS2_TARGET}/bin/nm
+${NIOS2_TARGET}/bin/objcopy
+${NIOS2_TARGET}/bin/objdump
+${NIOS2_TARGET}/bin/ranlib
+${NIOS2_TARGET}/bin/strip
+bin/${NIOS2_TARGET}-addr2line
+bin/${NIOS2_TARGET}-ar
+bin/${NIOS2_TARGET}-as
+bin/${NIOS2_TARGET}-c++filt
+bin/${NIOS2_TARGET}-elfedit
+bin/${NIOS2_TARGET}-gprof
+bin/${NIOS2_TARGET}-ld
+bin/${NIOS2_TARGET}-ld.bfd
+bin/${NIOS2_TARGET}-nm
+bin/${NIOS2_TARGET}-objcopy
+bin/${NIOS2_TARGET}-objdump
+bin/${NIOS2_TARGET}-ranlib
+bin/${NIOS2_TARGET}-readelf
+bin/${NIOS2_TARGET}-size
+bin/${NIOS2_TARGET}-strings
+bin/${NIOS2_TARGET}-strip
+info/${NIOS2_TARGET}/as.info
+info/${NIOS2_TARGET}/bfd.info
+info/${NIOS2_TARGET}/binutils.info
+info/${NIOS2_TARGET}/configure.info
+info/${NIOS2_TARGET}/gprof.info
+info/${NIOS2_TARGET}/ld.info
+info/${NIOS2_TARGET}/standards.info
+${NIOS2_TARGET}/lib/ldscripts/nios2elf-netbsd.x
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.x
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xbn
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xc
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xd
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xdc
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xdw
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xn
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xr
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xs
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xsc
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xsw
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xu
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xw
+${NIOS2_TARGET}/lib/libiberty.a
+man/man1/${NIOS2_TARGET}-addr2line.1
+man/man1/${NIOS2_TARGET}-ar.1
+man/man1/${NIOS2_TARGET}-as.1
+man/man1/${NIOS2_TARGET}-c++filt.1
+man/man1/${NIOS2_TARGET}-dlltool.1
+man/man1/${NIOS2_TARGET}-elfedit.1
+man/man1/${NIOS2_TARGET}-gprof.1
+man/man1/${NIOS2_TARGET}-ld.1
+man/man1/${NIOS2_TARGET}-nlmconv.1
+man/man1/${NIOS2_TARGET}-nm.1
+man/man1/${NIOS2_TARGET}-objcopy.1
+man/man1/${NIOS2_TARGET}-objdump.1
+man/man1/${NIOS2_TARGET}-ranlib.1
+man/man1/${NIOS2_TARGET}-readelf.1
+man/man1/${NIOS2_TARGET}-size.1
+man/man1/${NIOS2_TARGET}-strings.1
+man/man1/${NIOS2_TARGET}-strip.1
+man/man1/${NIOS2_TARGET}-windmc.1
+man/man1/${NIOS2_TARGET}-windres.1
diff --git a/cross/nios2-binutils/buildlink3.mk b/cross/nios2-binutils/buildlink3.mk
new file mode 100644
index 00000000000..d6af94f62bb
--- /dev/null
+++ b/cross/nios2-binutils/buildlink3.mk
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/11/18 06:41:27 mef Exp $
+
+BUILDLINK_TREE+=	nios2-binutils
+
+.if !defined(NIOS2_BINUTILS_BUILDLINK3_MK)
+NIOS2_BINUTILS_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.nios2-binutils+=		nios2-binutils>=2.20
+BUILDLINK_PKGSRCDIR.nios2-binutils?=		../../cross/nios2-binutils
+BUILDLINK_FNAME_TRANSFORM.nios2-binutils+=	-e "s,${NIOS2_TARGET}/lib,lib/,g"
+#BUILDLINK_CONTENTS_FILTER.nios2-binutils=	${EGREP} '.*'
+BUILDLINK_CONTENTS_FILTER.nios2-binutils=	${GREP} '${CROSSBASE}'
+
+.endif # NIOS2-BINUTILS_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-nios2-binutils
diff --git a/cross/nios2-binutils/distinfo b/cross/nios2-binutils/distinfo
new file mode 100644
index 00000000000..72e46458904
--- /dev/null
+++ b/cross/nios2-binutils/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.3 2013/11/18 06:41:27 mef Exp $
+
+SHA1 (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = 94a0dadc4c1370dadfacf4bc6cac591e3e47959b
+RMD160 (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = de056d240a73236d6d8be4851813d8b15d16808f
+Size (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = 251136787 bytes
diff --git a/cross/nios2-binutils/files/nios2elf-netbsd.x b/cross/nios2-binutils/files/nios2elf-netbsd.x
new file mode 100644
index 00000000000..be0b2ac41a6
--- /dev/null
+++ b/cross/nios2-binutils/files/nios2elf-netbsd.x
@@ -0,0 +1,227 @@
+/* Default linker script, for normal executables */
+OUTPUT_FORMAT("elf32-littlenios2", "elf32-bignios2",
+	      "elf32-littlenios2")
+OUTPUT_ARCH(nios2)
+ENTRY(__start)
+SEARCH_DIR("/usr/pkg/cross/lib");
+/* Do we need any of these for elf?
+   __DYNAMIC = 0;    */
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+/*  PROVIDE (__executable_start = 0x0400000); . = 0x0400000 + SIZEOF_HEADERS; */
+  PROVIDE (__executable_start = 0x0400000); . = 0x0400000 + 1048576;
+  .interp         : { *(.interp) }
+/* XXX */
+/*
+  .note.netbsd.ident : { *(.note.netbsd.ident) } :.text
+  .note.netbsd.pax : { *(.note.netbsd.pax) } :.text
+*/
+/* XXX */
+  .reginfo        : { *(.reginfo) }
+  .dynamic        : { *(.dynamic) }
+  .hash           : { *(.hash) }
+  .dynsym         : { *(.dynsym) }
+  .dynstr         : { *(.dynstr) }
+  .gnu.version    : { *(.gnu.version) }
+  .gnu.version_d  : { *(.gnu.version_d) }
+  .gnu.version_r  : { *(.gnu.version_r) }
+  .rel.init       : { *(.rel.init) }
+  .rela.init      : { *(.rela.init) }
+  .rel.text       : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) }
+  .rela.text      : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
+  .rel.fini       : { *(.rel.fini) }
+  .rela.fini      : { *(.rela.fini) }
+  .rel.rodata     : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) }
+  .rela.rodata    : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
+  .rel.data.rel.ro   : { *(.rel.data.rel.ro*) }
+  .rela.data.rel.ro   : { *(.rel.data.rel.ro*) }
+  .rel.data       : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) }
+  .rela.data      : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
+  .rel.tdata	  : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) }
+  .rela.tdata	  : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
+  .rel.tbss	  : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) }
+  .rela.tbss	  : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
+  .rel.ctors      : { *(.rel.ctors) }
+  .rela.ctors     : { *(.rela.ctors) }
+  .rel.dtors      : { *(.rel.dtors) }
+  .rela.dtors     : { *(.rela.dtors) }
+  .rel.got        : { *(.rel.got) }
+  .rela.got       : { *(.rela.got) }
+  .rel.sdata      : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) }
+  .rela.sdata     : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) }
+  .rel.sbss       : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) }
+  .rela.sbss      : { *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) }
+  .rel.sdata2     : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) }
+  .rela.sdata2    : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) }
+  .rel.sbss2      : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) }
+  .rela.sbss2     : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
+  .rel.bss        : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
+  .rela.bss       : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
+  .rel.plt        : { *(.rel.plt) }
+  .rela.plt       : { *(.rela.plt) }
+  .init           :
+  {
+    KEEP (*(.init))
+  } =0x0001883a
+  .plt            : { *(.plt) }
+  .text           :
+  {
+    _ftext = . ;
+    *(.text .stub .text.* .gnu.linkonce.t.*)
+    KEEP (*(.text.*personality*))
+    /* .gnu.warning sections are handled specially by elf32.em.  */
+    *(.gnu.warning)
+  } =0x0001883a
+  .fini           :
+  {
+    KEEP (*(.fini))
+  } =0x0001883a
+  PROVIDE (__etext = .);
+  PROVIDE (_etext = .);
+  PROVIDE (etext = .);
+  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
+  .rodata1        : { *(.rodata1) }
+  .sdata2         : { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) }
+  .sbss2          : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) }
+  .eh_frame_hdr : { *(.eh_frame_hdr) }
+/*  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) } */
+/*  .gcc_except_table   : ONLY_IF_RO { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) } */
+  /* Adjust the address for the data segment.  We want to adjust up to
+     the same address within the page on the next page up.  */
+  . = ALIGN (0x1000) - ((0x1000 - .) & (0x1000 - 1)); . = DATA_SEGMENT_ALIGN (0x1000, 0x1000);
+  /* Exception handling  */
+  .eh_frame       : /*ONLY_IF_RW*/ { KEEP (*(.eh_frame)) }
+  .gcc_except_table   : /*ONLY_IF_RW*/ { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) }
+  /* Thread Local Storage sections  */
+  .tdata	  : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
+  .tbss		  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
+  /* Ensure the __preinit_array_start label is properly aligned.  We
+     could instead move the label definition inside the section, but
+     the linker would then create the section even if it turns out to
+     be empty, which isn't pretty.  */
+  . = ALIGN(32 / 8);
+  PROVIDE (__preinit_array_start = .);
+  .preinit_array     : { KEEP (*(.preinit_array)) }
+  PROVIDE (__preinit_array_end = .);
+  PROVIDE (__init_array_start = .);
+  .init_array     : { KEEP (*(.init_array)) }
+  PROVIDE (__init_array_end = .);
+  PROVIDE (__fini_array_start = .);
+  .fini_array     : { KEEP (*(.fini_array)) }
+  PROVIDE (__fini_array_end = .);
+  .ctors          :
+  {
+    /* gcc uses crtbegin.o to find the start of
+       the constructors, so we make sure it is
+       first.  Because this is a wildcard, it
+       doesn't matter if the user does not
+       actually link against crtbegin.o; the
+       linker won't look for a file to match a
+       wildcard.  The wildcard also means that it
+       doesn't matter which directory crtbegin.o
+       is in.  */
+    KEEP (*crtbegin*.o(.ctors))
+    /* We don't want to include the .ctor section from
+       from the crtend.o file until after the sorted ctors.
+       The .ctor section from the crtend file contains the
+       end of ctors marker and it must be last */
+    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors))
+    KEEP (*(SORT(.ctors.*)))
+    KEEP (*(.ctors))
+  }
+  .dtors          :
+  {
+    KEEP (*crtbegin*.o(.dtors))
+    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors))
+    KEEP (*(SORT(.dtors.*)))
+    KEEP (*(.dtors))
+  }
+  .jcr            : { KEEP (*(.jcr)) }
+  .data.rel.ro : { *(.data.rel.ro.local) *(.data.rel.ro*) }
+/*  . = DATA_SEGMENT_RELRO_END (0, .); */
+  . = .;
+  .data           :
+  {
+    _fdata = . ;
+    *(.data .data.* .gnu.linkonce.d.*)
+    KEEP (*(.gnu.linkonce.d.*personality*))
+    SORT(CONSTRUCTORS)
+  }
+  .data1          : { *(.data1) }
+  . = .;
+  _gp = ALIGN(16) + 0x7ff0;
+  PROVIDE(gp = _gp);
+  .got            : { *(.got.plt) *(.got) }
+  /* We want the small data sections together, so single-instruction offsets
+     can access them all, and initialized data all before uninitialized, so
+     we can shorten the on-disk segment size.  */
+  .sdata          :
+  {
+    *(.sdata .sdata.* .gnu.linkonce.s.*)
+  }
+  .lit8           : { *(.lit8) }
+  .lit4           : { *(.lit4) }
+  _edata = .;
+  PROVIDE (edata = .);
+  __bss_start = .;
+  _fbss = .;
+  .sbss           :
+  {
+    PROVIDE (__sbss_start = .);
+    PROVIDE (___sbss_start = .);
+    *(.dynsbss)
+    *(.sbss .sbss.* .gnu.linkonce.sb.*)
+    *(.scommon)
+    PROVIDE (__sbss_end = .);
+    PROVIDE (___sbss_end = .);
+  }
+  .bss            :
+  {
+   *(.dynbss)
+   *(.bss .bss.* .gnu.linkonce.b.*)
+   *(COMMON)
+   /* Align here to ensure that the .bss section occupies space up to
+      _end.  Align after .bss to ensure correct alignment even if the
+      .bss section disappears because there are no input sections.  */
+   . = ALIGN(32 / 8);
+  }
+  . = ALIGN(32 / 8);
+  _end = .;
+  PROVIDE (end = .);
+  . = DATA_SEGMENT_END (.);
+  /* Stabs debugging sections.  */
+  .stab          0 : { *(.stab) }
+  .stabstr       0 : { *(.stabstr) }
+  .stab.excl     0 : { *(.stab.excl) }
+  .stab.exclstr  0 : { *(.stab.exclstr) }
+  .stab.index    0 : { *(.stab.index) }
+  .stab.indexstr 0 : { *(.stab.indexstr) }
+  .comment       0 : { *(.comment) }
+  /* DWARF debug sections.
+     Symbols in the DWARF debugging sections are relative to the beginning
+     of the section so we begin them at 0.  */
+  /* DWARF 1 */
+  .debug          0 : { *(.debug) }
+  .line           0 : { *(.line) }
+  /* GNU DWARF 1 extensions */
+  .debug_srcinfo  0 : { *(.debug_srcinfo) }
+  .debug_sfnames  0 : { *(.debug_sfnames) }
+  /* DWARF 1.1 and DWARF 2 */
+  .debug_aranges  0 : { *(.debug_aranges) }
+  .debug_pubnames 0 : { *(.debug_pubnames) }
+  /* DWARF 2 */
+  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
+  .debug_abbrev   0 : { *(.debug_abbrev) }
+  .debug_line     0 : { *(.debug_line) }
+  .debug_frame    0 : { *(.debug_frame) }
+  .debug_str      0 : { *(.debug_str) }
+  .debug_loc      0 : { *(.debug_loc) }
+  .debug_macinfo  0 : { *(.debug_macinfo) }
+  /* SGI/MIPS DWARF 2 extensions */
+  .debug_weaknames 0 : { *(.debug_weaknames) }
+  .debug_funcnames 0 : { *(.debug_funcnames) }
+  .debug_typenames 0 : { *(.debug_typenames) }
+  .debug_varnames  0 : { *(.debug_varnames) }
+  /DISCARD/ : { *(.note.GNU-stack) }
+}