(pkgsrc)

  Switch from Codesourcery to GNU FSF
(Upstream 2.23.2 to 2.24.0)
- binutils
  * Objcopy now supports wildcard characters in command line options that take
    section names.
  * Add support for Altera Nios II.
- gas
  * Add support for the Texas Instruments MSP430X processor.
  * Add -gdwarf-sections command line option to enable per-code-section
    generation of DWARF .debug_line sections.
  * Add support for Altera Nios II.
  * Add support for the Imagination Technologies Meta processor.
  * Add support for the v850e3v5.
  * Remove assembler support for MIPS ECOFF targets.
- ld
  * Add LOG2CEIL() builtin function to the linker script language
  * Add support for the Texas Instruments MSP430X processor.
  * Add support for Altera Nios II.
  * Add support for the V850E3V5 architecture.
  * Add support for the Imagination Technologies Meta processor.
  * --enable-new-dtags no longer generates old dtags in addition to new dtags.
  * Remove linker support for MIPS ECOFF targets.
  * Add ALIGN_WITH_INPUT to the linker script language to force the alignment of
    an output section to use the maximum alignment of all its input sections.

13 files changed, 176 insertions, 91 deletions

diff --git a/cross/nios2-binutils/DESCR b/cross/nios2-binutils/DESCR
index 1071554d8bc..f4ccf8546b3 100644
--- a/cross/nios2-binutils/DESCR
+++ b/cross/nios2-binutils/DESCR
@@ -1 +1 @@
-Cross binutils 2.23 for ALTERA FPGA Nios2 processor.
+Cross binutils 2.24 for ALTERA FPGA Nios2 processor.
diff --git a/cross/nios2-binutils/Makefile b/cross/nios2-binutils/Makefile
index 718a360f4f9..944c93d5471 100644
--- a/cross/nios2-binutils/Makefile
+++ b/cross/nios2-binutils/Makefile
@@ -1,49 +1,32 @@
-# $NetBSD: Makefile,v 1.8 2014/05/29 23:35:24 wiz Exp $
-.include		"../../cross/nios2/Makefile.common"
-PKGNAME=		nios2-binutils-${PKG_VERSION}
-PKG_VERSION=		2.23
-PKGREVISION=		1
+# $NetBSD: Makefile,v 1.9 2014/06/15 23:43:13 mef Exp $
+
+DISTNAME=		binutils-2.24
+PKGNAME=		${DISTNAME:S/^/nios2-/}
+CATEGORIES=		cross
+MASTER_SITES=		${MASTER_SITE_GNU:=binutils/}
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-#HOMEPAGE=
+HOMEPAGE=		http://www.gnu.org/software/binutils/
 COMMENT=		GNU binutils for Altera FPGA Nios2 processor
 LICENSE=		gnu-gpl-v3
 
+# No need to use makeinfo - this package doesn't install the documentation.
+USE_TOOLS+=		gmake
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
 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
-GNU_CONFIGURE_LIBDIR=	${PREFIX}/${NIOS2_TARGET}/lib
-
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mclang)
-CFLAGS+=	-Wno-string-plus-int -Wno-self-assign
-.endif
-
-# 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}
+USE_GNU_CONFIGURE_HOST=	no
+INFO_FILES=		# empty
 
-.include "options.mk"
+NIOS2_TARGET=		nios2-elf
+CONFIGURE_ARGS+=	--disable-werror --target=${NIOS2_TARGET} --disable-nls
+PLIST_SUBST+=		NIOS2_TARGET=${NIOS2_TARGET:Q}
 
-do-extract:
-	(cd ${WRKDIR}; tar jxf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}	\
-	        sourceryg++-2013.05-43-nios2-linux-gnu/binutils-2013.05-43.tar.bz2;\
-	tar jxf sourceryg++-2013.05-43-nios2-linux-gnu/binutils-2013.05-43.tar.bz2;\
-	)
+BUILD_DEFS+=		CROSSBASE
+PATH:=			${CROSSBASE}/bin:${PATH}
+AUTO_MKDIRS=		yes
 
 # following file installed is reference only, not used at all for the moment
 post-install:
@@ -51,8 +34,10 @@ post-install:
 
 .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
+# ./configure.lineno: 3239: Syntax error: Missing '}'
+# Makefile:2991: recipe for target 'configure-opcodes' failed
+# gmake[1]: *** [configure-opcodes] Error 1
+# gmake[1]: Leaving directory '/export/WRKOBJDIR/wip/avr-binutils/work/binutils-2.24'
+# see avr-binutils
 PKGSRC_MAKE_ENV+=	SH=/bin/ksh
diff --git a/cross/nios2-binutils/PLIST b/cross/nios2-binutils/PLIST
index 6c89b58abff..89ea1ac079e 100644
--- a/cross/nios2-binutils/PLIST
+++ b/cross/nios2-binutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2013/11/18 06:41:27 mef Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/06/15 23:43:13 mef Exp $
 ${NIOS2_TARGET}/bin/ar
 ${NIOS2_TARGET}/bin/as
 ${NIOS2_TARGET}/bin/ld
@@ -24,13 +24,6 @@ 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
@@ -45,7 +38,6 @@ ${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
diff --git a/cross/nios2-binutils/distinfo b/cross/nios2-binutils/distinfo
index 7e18c11aa5b..e483816ae62 100644
--- a/cross/nios2-binutils/distinfo
+++ b/cross/nios2-binutils/distinfo
@@ -1,6 +1,13 @@
-$NetBSD: distinfo,v 1.4 2013/12/08 22:31:54 joerg Exp $
+$NetBSD: distinfo,v 1.5 2014/06/15 23:43:13 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
-SHA1 (patch-libiberty_Makefile.in) = 1e446461751d036eec91110fa094bf4fbbfee128
+SHA1 (binutils-2.24.tar.bz2) = 7ac75404ddb3c4910c7594b51ddfc76d4693debb
+RMD160 (binutils-2.24.tar.bz2) = b4aa3ea5ba9d0d9f817b2cf136e7f911f692af8d
+Size (binutils-2.24.tar.bz2) = 22716802 bytes
+SHA1 (patch-ab) = e2bc22866d8e04b0d670509f3295da5f0e535ac8
+SHA1 (patch-ad) = 6d1acfd834c692abcc4f454db5f5107b7f77e34e
+SHA1 (patch-ae) = fff6693a610b26aa60e1d96ad634d15d11afbe05
+SHA1 (patch-af) = 5fa08da0b31da042eb30cce683f7b7b1feb3196b
+SHA1 (patch-ag) = e778ddd88f34e264e6b2d6d31a56a02be565e916
+SHA1 (patch-ah) = b6e91279475c41bc78b3df227938a91948fc377c
+SHA1 (patch-ai) = 3cd298ac0364f913c1261fc87f7f474281bae9cf
+SHA1 (patch-aj) = fd2a66979f68350a53960defdaf5e9e5018ec59a
diff --git a/cross/nios2-binutils/patches/patch-ab b/cross/nios2-binutils/patches/patch-ab
new file mode 100644
index 00000000000..055716101e7
--- /dev/null
+++ b/cross/nios2-binutils/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2014/06/15 23:43:14 mef Exp $
+
+Avoid installing info file.
+
+--- bfd/Makefile.in.orig	2011-11-21 20:55:49.000000000 +0900
++++ bfd/Makefile.in	2012-02-06 22:14:51.000000000 +0900
+@@ -1713,7 +1713,6 @@
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: $(BUILT_SOURCES)
+-	$(MAKE) $(AM_MAKEFLAGS) install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+ uninstall: uninstall-recursive
diff --git a/cross/nios2-binutils/patches/patch-ad b/cross/nios2-binutils/patches/patch-ad
new file mode 100644
index 00000000000..592143e0ef3
--- /dev/null
+++ b/cross/nios2-binutils/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2014/06/15 23:43:14 mef Exp $
+
+Avoid installing info (which duplicates with other CPU)
+
+--- etc/Makefile.in.orig	2010-11-21 04:37:57.000000000 +0900
++++ etc/Makefile.in	2012-02-06 21:50:04.000000000 +0900
+@@ -64,7 +64,7 @@
+ HTMLFILES = standards.html configure.html
+ 
+ all: info
+-install install-strip: install-info
++install install-strip:
+ 
+ uninstall:
+ 
diff --git a/cross/nios2-binutils/patches/patch-ae b/cross/nios2-binutils/patches/patch-ae
new file mode 100644
index 00000000000..7fb2c5ab6e3
--- /dev/null
+++ b/cross/nios2-binutils/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2014/06/15 23:43:14 mef Exp $
+
+Avoid installing info (which duplicates with other CPU)
+
+--- binutils/doc/Makefile.in.orig	2008-08-15 10:31:47 +0200
++++ binutils/doc/Makefile.in
+@@ -65,7 +65,7 @@ CONFIG_CLEAN_FILES =
+ depcomp =
+ am__depfiles_maybe =
+ SOURCES =
+-INFO_DEPS = binutils.info
++INFO_DEPS =
+ TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex
+ am__TEXINFO_TEX_DIR = $(top_srcdir)/../texinfo
+ DVIS = binutils.dvi
diff --git a/cross/nios2-binutils/patches/patch-af b/cross/nios2-binutils/patches/patch-af
new file mode 100644
index 00000000000..b678e80ec69
--- /dev/null
+++ b/cross/nios2-binutils/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1 2014/06/15 23:43:14 mef Exp $
+
+Avoid installing info (which duplicates with other CPU)
+
+--- gas/doc/Makefile.in.orig	2008-08-15 10:31:50 +0200
++++ gas/doc/Makefile.in
+@@ -62,7 +62,7 @@ CONFIG_CLEAN_FILES =
+ depcomp =
+ am__depfiles_maybe =
+ SOURCES =
+-INFO_DEPS = as.info
++INFO_DEPS =
+ TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex
+ am__TEXINFO_TEX_DIR = $(top_srcdir)/../texinfo
+ DVIS = as.dvi
diff --git a/cross/nios2-binutils/patches/patch-ag b/cross/nios2-binutils/patches/patch-ag
new file mode 100644
index 00000000000..9940f0d3377
--- /dev/null
+++ b/cross/nios2-binutils/patches/patch-ag
@@ -0,0 +1,24 @@
+$NetBSD: patch-ag,v 1.1 2014/06/15 23:43:14 mef Exp $
+
+Avoid installing info (which duplicates with other CPU)
+
+--- ld/Makefile.in.orig	2012-09-04 21:53:47.000000000 +0900
++++ ld/Makefile.in	2013-01-27 07:19:44.000000000 +0900
+@@ -118,7 +118,7 @@ LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLF
+ 	--mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
+ SOURCES = $(libldtestplug_la_SOURCES) $(ld_new_SOURCES) \
+ 	$(EXTRA_ld_new_SOURCES)
+-INFO_DEPS = ld.info
++INFO_DEPS =
+ am__TEXINFO_TEX_DIR = $(srcdir)/../texinfo
+ DVIS = ld.dvi
+ PDFS = ld.pdf
+@@ -345,7 +345,7 @@ use_sysroot = @use_sysroot@
+ AUTOMAKE_OPTIONS = dejagnu no-texinfo.tex no-dist foreign
+ ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
+ TEXINFO_TEX = ../texinfo/texinfo.tex
+-SUBDIRS = po
++SUBDIRS =
+ tooldir = $(exec_prefix)/$(target_alias)
+ 
+ # Automake 1.10+ disables lex and yacc output file regeneration if
diff --git a/cross/nios2-binutils/patches/patch-ah b/cross/nios2-binutils/patches/patch-ah
new file mode 100644
index 00000000000..c9f74af446f
--- /dev/null
+++ b/cross/nios2-binutils/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1 2014/06/15 23:43:14 mef Exp $
+
+Avoid installing po (nls) files
+
+--- binutils/Makefile.in.orig	2011-08-08 09:27:15.000000000 +0900
++++ binutils/Makefile.in	2012-02-06 21:51:20.000000000 +0900
+@@ -405,7 +405,7 @@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = dejagnu no-dist foreign
+ ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
+-SUBDIRS = doc po
++SUBDIRS = doc
+ tooldir = $(exec_prefix)/$(target_alias)
+ 
+ # Automake 1.10+ disables lex and yacc output file regeneration if
diff --git a/cross/nios2-binutils/patches/patch-ai b/cross/nios2-binutils/patches/patch-ai
new file mode 100644
index 00000000000..30f4ba23dec
--- /dev/null
+++ b/cross/nios2-binutils/patches/patch-ai
@@ -0,0 +1,15 @@
+$NetBSD: patch-ai,v 1.1 2014/06/15 23:43:14 mef Exp $
+
+Avoid installing po (nls) files
+
+--- gas/Makefile.in.orig	2011-06-14 00:18:47.000000000 +0900
++++ gas/Makefile.in	2012-02-06 21:51:43.000000000 +0900
+@@ -281,7 +281,7 @@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.11 dejagnu foreign no-dist
+ ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
+-SUBDIRS = doc po
++SUBDIRS = doc
+ tooldir = $(exec_prefix)/$(target_alias)
+ 
+ # Automake 1.10+ disables lex and yacc output file regeneration if
diff --git a/cross/nios2-binutils/patches/patch-aj b/cross/nios2-binutils/patches/patch-aj
new file mode 100644
index 00000000000..04c32565858
--- /dev/null
+++ b/cross/nios2-binutils/patches/patch-aj
@@ -0,0 +1,24 @@
+$NetBSD: patch-aj,v 1.1 2014/06/15 23:43:14 mef Exp $
+
+Avoid installing info and po (nls) files
+
+--- gprof/Makefile.in.orig	2012-06-02 19:19:23.000000000 +0900
++++ gprof/Makefile.in	2013-01-27 07:21:40.000000000 +0900
+@@ -93,7 +93,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
+ 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
+ SOURCES = $(gprof_SOURCES)
+-INFO_DEPS = gprof.info
++INFO_DEPS = 
+ am__TEXINFO_TEX_DIR = $(srcdir)/../texinfo
+ DVIS = gprof.dvi
+ PDFS = gprof.pdf
+@@ -279,7 +279,7 @@ AUTOMAKE_OPTIONS = 1.11 foreign no-dist 
+ ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
+ TEXINFO_TEX = ../texinfo/texinfo.tex
+ SUFFIXES = .m
+-SUBDIRS = po
++SUBDIRS =
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
diff --git a/cross/nios2-binutils/patches/patch-libiberty_Makefile.in b/cross/nios2-binutils/patches/patch-libiberty_Makefile.in
deleted file mode 100644
index 99143fedc6a..00000000000
--- a/cross/nios2-binutils/patches/patch-libiberty_Makefile.in
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-libiberty_Makefile.in,v 1.1 2013/12/08 22:31:54 joerg Exp $
-
---- libiberty/Makefile.in.orig	2013-12-08 15:46:44.000000000 +0000
-+++ libiberty/Makefile.in
-@@ -354,12 +354,11 @@ install-strip: install
- # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
- # default multilib, so we have to take CFLAGS into account as well,
- # since it will be passed the multilib flags.
--MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
- install_to_libdir: all
--	${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
--	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n
--	( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n )
--	mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)
-+	${mkinstalldirs} $(DESTDIR)$(libdir)
-+	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(TARGETLIB)n
-+	( cd $(DESTDIR)$(libdir) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n )
-+	mv -f $(DESTDIR)$(libdir)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(TARGETLIB)
- 	if test -n "${target_header_dir}"; then \
- 	  case "${target_header_dir}" in \
- 	    /*)    thd=${target_header_dir};; \
-@@ -373,10 +372,10 @@ install_to_libdir: all
- 	@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
- 
- install_to_tooldir: all
--	${mkinstalldirs} $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)
--	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n
--	( cd $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n; $(RANLIB) $(TARGETLIB)n )
--	mv -f $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)
-+	${mkinstalldirs} $(DESTDIR)$(tooldir)/lib
-+	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/$(TARGETLIB)n
-+	( cd $(DESTDIR)$(tooldir)/lib ; chmod 644 $(TARGETLIB)n; $(RANLIB) $(TARGETLIB)n )
-+	mv -f $(DESTDIR)$(tooldir)/lib/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib/$(TARGETLIB)
- 	@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
- 
- # required-list was used when building a shared bfd/opcodes/libiberty