From ebdf057022ccddc1d2210ec9e7f7366d7b5d58cc Mon Sep 17 00:00:00 2001
From: hasso <hasso>
Date: Thu, 27 Aug 2009 15:26:41 +0000
Subject: Update to 2.19.1. Upstream changelog is obviously too massive to
 paste it here. All hard update work done by Simon 'corecode' Schubert and
 minor modifications (DESTDIR etc) by me.

---
 cross/avr-binutils/Makefile         | 10 +++--
 cross/avr-binutils/PLIST            | 78 ++++++++++++++++---------------------
 cross/avr-binutils/distinfo         | 27 ++++++-------
 cross/avr-binutils/patches/patch-aa | 16 +++-----
 cross/avr-binutils/patches/patch-ab | 18 ++++-----
 cross/avr-binutils/patches/patch-ac | 18 ++++-----
 cross/avr-binutils/patches/patch-ad | 12 +++---
 cross/avr-binutils/patches/patch-ae | 16 ++++----
 cross/avr-binutils/patches/patch-af | 16 ++++----
 cross/avr-binutils/patches/patch-ag | 32 +++++++--------
 cross/avr-binutils/patches/patch-ah | 14 +++----
 cross/avr-binutils/patches/patch-ai | 18 ++++-----
 cross/avr-binutils/patches/patch-aj | 22 +++++++++++
 13 files changed, 154 insertions(+), 143 deletions(-)
 create mode 100644 cross/avr-binutils/patches/patch-aj

(limited to 'cross/avr-binutils')

diff --git a/cross/avr-binutils/Makefile b/cross/avr-binutils/Makefile
index fb4526d592d..7c2ff1cc263 100644
--- a/cross/avr-binutils/Makefile
+++ b/cross/avr-binutils/Makefile
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.14 2006/08/03 19:22:31 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2009/08/27 15:26:41 hasso Exp $
 
-DISTNAME=		binutils-2.13.2.1
-PKGNAME=		avr-binutils-2.13.2.1
-PKGREVISION=		2
+DISTNAME=		binutils-2.19.1
+PKGNAME=		avr-binutils-2.19.1
 CATEGORIES=		cross
 MASTER_SITES=		${MASTER_SITE_GNU:=binutils/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		GNU binutils for Atmel AVR 8-bit RISC microcontrollers
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_BZIP2=		yes
 USE_TOOLS+=		gmake makeinfo
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
+USE_GNU_CONFIGURE_HOST=	no
 
 CONFIGURE_ARGS+=	--target=avr
 
diff --git a/cross/avr-binutils/PLIST b/cross/avr-binutils/PLIST
index b2dee21680a..1cfc4a5f3d1 100644
--- a/cross/avr-binutils/PLIST
+++ b/cross/avr-binutils/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:39:52 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/08/27 15:26:41 hasso Exp $
 avr/bin/ar
 avr/bin/as
 avr/bin/ld
 avr/bin/nm
+avr/bin/objcopy
+avr/bin/objdump
 avr/bin/ranlib
 avr/bin/strip
 avr/lib/ldscripts/avr1.x
@@ -10,70 +12,56 @@ avr/lib/ldscripts/avr1.xbn
 avr/lib/ldscripts/avr1.xn
 avr/lib/ldscripts/avr1.xr
 avr/lib/ldscripts/avr1.xu
-avr/lib/ldscripts/avr1200.x
-avr/lib/ldscripts/avr1200.xbn
-avr/lib/ldscripts/avr1200.xn
-avr/lib/ldscripts/avr1200.xr
-avr/lib/ldscripts/avr1200.xu
 avr/lib/ldscripts/avr2.x
 avr/lib/ldscripts/avr2.xbn
 avr/lib/ldscripts/avr2.xn
 avr/lib/ldscripts/avr2.xr
 avr/lib/ldscripts/avr2.xu
-avr/lib/ldscripts/avr23xx.x
-avr/lib/ldscripts/avr23xx.xbn
-avr/lib/ldscripts/avr23xx.xn
-avr/lib/ldscripts/avr23xx.xr
-avr/lib/ldscripts/avr23xx.xu
+avr/lib/ldscripts/avr25.x
+avr/lib/ldscripts/avr25.xbn
+avr/lib/ldscripts/avr25.xn
+avr/lib/ldscripts/avr25.xr
+avr/lib/ldscripts/avr25.xu
 avr/lib/ldscripts/avr3.x
 avr/lib/ldscripts/avr3.xbn
 avr/lib/ldscripts/avr3.xn
 avr/lib/ldscripts/avr3.xr
 avr/lib/ldscripts/avr3.xu
+avr/lib/ldscripts/avr31.x
+avr/lib/ldscripts/avr31.xbn
+avr/lib/ldscripts/avr31.xn
+avr/lib/ldscripts/avr31.xr
+avr/lib/ldscripts/avr31.xu
+avr/lib/ldscripts/avr35.x
+avr/lib/ldscripts/avr35.xbn
+avr/lib/ldscripts/avr35.xn
+avr/lib/ldscripts/avr35.xr
+avr/lib/ldscripts/avr35.xu
 avr/lib/ldscripts/avr4.x
 avr/lib/ldscripts/avr4.xbn
 avr/lib/ldscripts/avr4.xn
 avr/lib/ldscripts/avr4.xr
 avr/lib/ldscripts/avr4.xu
-avr/lib/ldscripts/avr4433.x
-avr/lib/ldscripts/avr4433.xbn
-avr/lib/ldscripts/avr4433.xn
-avr/lib/ldscripts/avr4433.xr
-avr/lib/ldscripts/avr4433.xu
-avr/lib/ldscripts/avr44x4.x
-avr/lib/ldscripts/avr44x4.xbn
-avr/lib/ldscripts/avr44x4.xn
-avr/lib/ldscripts/avr44x4.xr
-avr/lib/ldscripts/avr44x4.xu
 avr/lib/ldscripts/avr5.x
 avr/lib/ldscripts/avr5.xbn
 avr/lib/ldscripts/avr5.xn
 avr/lib/ldscripts/avr5.xr
 avr/lib/ldscripts/avr5.xu
-avr/lib/ldscripts/avr85xx.x
-avr/lib/ldscripts/avr85xx.xbn
-avr/lib/ldscripts/avr85xx.xn
-avr/lib/ldscripts/avr85xx.xr
-avr/lib/ldscripts/avr85xx.xu
-avr/lib/ldscripts/avrmega103.x
-avr/lib/ldscripts/avrmega103.xbn
-avr/lib/ldscripts/avrmega103.xn
-avr/lib/ldscripts/avrmega103.xr
-avr/lib/ldscripts/avrmega103.xu
-avr/lib/ldscripts/avrmega161.x
-avr/lib/ldscripts/avrmega161.xbn
-avr/lib/ldscripts/avrmega161.xn
-avr/lib/ldscripts/avrmega161.xr
-avr/lib/ldscripts/avrmega161.xu
-avr/lib/ldscripts/avrmega603.x
-avr/lib/ldscripts/avrmega603.xbn
-avr/lib/ldscripts/avrmega603.xn
-avr/lib/ldscripts/avrmega603.xr
-avr/lib/ldscripts/avrmega603.xu
+avr/lib/ldscripts/avr51.x
+avr/lib/ldscripts/avr51.xbn
+avr/lib/ldscripts/avr51.xn
+avr/lib/ldscripts/avr51.xr
+avr/lib/ldscripts/avr51.xu
+avr/lib/ldscripts/avr6.x
+avr/lib/ldscripts/avr6.xbn
+avr/lib/ldscripts/avr6.xn
+avr/lib/ldscripts/avr6.xr
+avr/lib/ldscripts/avr6.xu
 bin/avr-addr2line
 bin/avr-ar
 bin/avr-as
 bin/avr-c++filt
+bin/avr-gprof
 bin/avr-ld
 bin/avr-nm
 bin/avr-objcopy
@@ -85,7 +73,11 @@ bin/avr-strings
 bin/avr-strip
 man/man1/avr-addr2line.1
 man/man1/avr-ar.1
+man/man1/avr-as.1
+man/man1/avr-c++filt.1
 man/man1/avr-dlltool.1
+man/man1/avr-gprof.1
+man/man1/avr-ld.1
 man/man1/avr-nlmconv.1
 man/man1/avr-nm.1
 man/man1/avr-objcopy.1
@@ -95,7 +87,5 @@ man/man1/avr-readelf.1
 man/man1/avr-size.1
 man/man1/avr-strings.1
 man/man1/avr-strip.1
+man/man1/avr-windmc.1
 man/man1/avr-windres.1
-man/man1/avr-c++filt.1
-man/man1/avr-as.1
-man/man1/avr-ld.1
diff --git a/cross/avr-binutils/distinfo b/cross/avr-binutils/distinfo
index e0d14c0b695..e5dc740d724 100644
--- a/cross/avr-binutils/distinfo
+++ b/cross/avr-binutils/distinfo
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 10:16:52 agc Exp $
+$NetBSD: distinfo,v 1.5 2009/08/27 15:26:41 hasso Exp $
 
-SHA1 (binutils-2.13.2.1.tar.gz) = d13624807c6b47fec870096a65d47cce4cf82370
-RMD160 (binutils-2.13.2.1.tar.gz) = 7100913d4c9a98d76eced1d84bd771a3374ea9e2
-Size (binutils-2.13.2.1.tar.gz) = 12980018 bytes
-SHA1 (patch-aa) = 1e5af4a428314b46fa9c5b5c00e63406d692a0e2
-SHA1 (patch-ab) = abc8b9f823b27d756e1588af45af266efa038d03
-SHA1 (patch-ac) = 9261e61c68d50ba771ff74d3dba0670796a256af
-SHA1 (patch-ad) = 306fa82019efec11ae8ed18bf6853934a0f6c16f
-SHA1 (patch-ae) = 8d1f64fa51ed4fb7bbed49f3cedb20c1e08bce0d
-SHA1 (patch-af) = 92f0a4156ed6ea1027dcdffbbf41f05732b6dba9
-SHA1 (patch-ag) = ab2bd066584a8c54663547c78afb4eaac4515446
-SHA1 (patch-ah) = 0559821757c0b112b118bd966430f9d1c3894a83
-SHA1 (patch-ai) = 559e4d685369ca37ecb0168573e7a77e657fd1bf
+SHA1 (binutils-2.19.1.tar.gz) = 7e930435c47991c4070b1c74b010350e4669011f
+RMD160 (binutils-2.19.1.tar.gz) = 98916f371f647864997bb00084a5e7a0fd46d982
+Size (binutils-2.19.1.tar.gz) = 21601735 bytes
+SHA1 (patch-aa) = a298657340e6db5a77b45a09d98f84c2220d45bb
+SHA1 (patch-ab) = 0e71dc9932c42c1dcc6df2890cb0358e0aec1e55
+SHA1 (patch-ac) = f05dec7809fc38ebed5873b21981f62dcd8a1636
+SHA1 (patch-ad) = b933a733e355127c197e80e1c49a105469913280
+SHA1 (patch-ae) = 4b1505364d4176e8e374b576d62e1ca8e3d20e27
+SHA1 (patch-af) = 1bea903e88ad254339486e0de80112275966092a
+SHA1 (patch-ag) = 05501ffcafcda086b2e3d234e558c625f137b122
+SHA1 (patch-ah) = 2e7fbb530a915accd0ad3ee3626faed1b494c241
+SHA1 (patch-ai) = 6646c38cbd86d0dd3e3fbdc1c8e265d49e258ebc
+SHA1 (patch-aj) = 94d1ef1b49c7b0bd64ee9dba6139ee86cb50f8fc
diff --git a/cross/avr-binutils/patches/patch-aa b/cross/avr-binutils/patches/patch-aa
index afbb3be1515..e59ba3b8ce1 100644
--- a/cross/avr-binutils/patches/patch-aa
+++ b/cross/avr-binutils/patches/patch-aa
@@ -1,10 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/07/15 21:46:26 wennmach Exp $
+$NetBSD: patch-aa,v 1.2 2009/08/27 15:26:41 hasso Exp $
 
---- libiberty/Makefile.in.orig	2003-06-27 00:49:43.000000000 +0200
-+++ libiberty/Makefile.in	2003-06-27 00:50:19.000000000 +0200
-@@ -254,11 +254,12 @@
- @MAINT@stamp-functions : $(CFILES) $(TEXIFILES) $(srcdir)/gather-docs Makefile
- @MAINT@@HAVE_PERL@	$(PERL) $(srcdir)/gather-docs $(srcdir) $(srcdir)/functions.texi $(CFILES) $(TEXIFILES)
+--- libiberty/Makefile.in.orig	2008-07-24 15:51:49 +0200
++++ libiberty/Makefile.in
+@@ -346,7 +346,8 @@ libiberty.html : $(srcdir)/libiberty.tex
  @MAINT@	echo stamp > stamp-functions
  
  INSTALL_DEST = @INSTALL_DEST@
@@ -12,7 +10,5 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/07/15 21:46:26 wennmach Exp $
 +#install: install_to_$(INSTALL_DEST) install-subdir
 +install:
  
- install_to_libdir: all
- 	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n
- 	( cd $(DESTDIR)$(libdir)$(MULTISUBDIR) ; $(RANLIB) $(TARGETLIB)n )
- 	mv -f $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)
+ # This is tricky.  Even though CC in the Makefile contains
+ # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
diff --git a/cross/avr-binutils/patches/patch-ab b/cross/avr-binutils/patches/patch-ab
index cbbf2f6161b..bf5bba17761 100644
--- a/cross/avr-binutils/patches/patch-ab
+++ b/cross/avr-binutils/patches/patch-ab
@@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/07/15 21:46:26 wennmach Exp $
+$NetBSD: patch-ab,v 1.2 2009/08/27 15:26:41 hasso Exp $
 
---- bfd/Makefile.in.orig	Fri May 31 04:59:46 2002
-+++ bfd/Makefile.in	Tue Jun  4 15:58:06 2002
-@@ -1047,7 +1047,8 @@
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+--- bfd/Makefile.in.orig	2009-02-02 11:44:39 +0100
++++ bfd/Makefile.in
+@@ -1222,7 +1222,8 @@ installdirs-am:
+ 	for dir in "$(DESTDIR)$(bfdlibdir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
 -install: install-recursive
 +#install: install-recursive
 +install:
- uninstall-am: uninstall-bfdlibLTLIBRARIES
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
  uninstall: uninstall-recursive
- all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) config.h
diff --git a/cross/avr-binutils/patches/patch-ac b/cross/avr-binutils/patches/patch-ac
index 7d61be39856..4fead6d343d 100644
--- a/cross/avr-binutils/patches/patch-ac
+++ b/cross/avr-binutils/patches/patch-ac
@@ -1,14 +1,14 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/07/15 21:46:26 wennmach Exp $
+$NetBSD: patch-ac,v 1.2 2009/08/27 15:26:41 hasso Exp $
 
---- opcodes/Makefile.in.orig	Tue Jun  4 15:59:05 2002
-+++ opcodes/Makefile.in	Tue Jun  4 15:58:47 2002
-@@ -702,7 +702,8 @@
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+--- opcodes/Makefile.in.orig	2008-09-09 10:02:19 +0200
++++ opcodes/Makefile.in
+@@ -879,7 +879,8 @@ installdirs-am:
+ 	for dir in "$(DESTDIR)$(bfdlibdir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
 -install: install-recursive
 +#install: install-recursive
 +install:
- uninstall-am: uninstall-bfdlibLTLIBRARIES
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
  uninstall: uninstall-recursive
- all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) config.h
diff --git a/cross/avr-binutils/patches/patch-ad b/cross/avr-binutils/patches/patch-ad
index bb92bf9a169..e80cb69488c 100644
--- a/cross/avr-binutils/patches/patch-ad
+++ b/cross/avr-binutils/patches/patch-ad
@@ -1,11 +1,11 @@
-$NetBSD: patch-ad,v 1.1.1.1 2003/07/15 21:46:26 wennmach Exp $
+$NetBSD: patch-ad,v 1.2 2009/08/27 15:26:41 hasso Exp $
 
---- etc/Makefile.in.orig	Sat Jan 26 22:35:45 2002
-+++ etc/Makefile.in	Tue Jun  4 16:50:05 2002
-@@ -52,7 +52,8 @@
- all:
+--- etc/Makefile.in.orig	2007-03-27 20:09:32 +0200
++++ etc/Makefile.in
+@@ -64,7 +64,8 @@ PDFFILES = standards.pdf configure.pdf
+ HTMLFILES = standards.html configure.html
  
- # We want install to imply install-info as per GNU standards.
+ all: info
 -install: install-info
 +#install: install-info
 +install:
diff --git a/cross/avr-binutils/patches/patch-ae b/cross/avr-binutils/patches/patch-ae
index 5993f63fa97..8280eecd4c8 100644
--- a/cross/avr-binutils/patches/patch-ae
+++ b/cross/avr-binutils/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2003/09/19 12:34:27 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2009/08/27 15:26:41 hasso Exp $
 
---- binutils/doc/Makefile.in.orig	Tue Jul 16 04:04:37 2002
+--- binutils/doc/Makefile.in.orig	2008-08-15 10:31:47 +0200
 +++ binutils/doc/Makefile.in
-@@ -167,7 +167,7 @@ CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
- TEXI2DVI = `if test -f $(top_srcdir)/../texinfo/util/texi2dvi; then echo $(top_srcdir)/../texinfo/util/texi2dvi; else echo texi2dvi; fi`
- TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex
+@@ -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
- TEXINFOS = binutils.texi
- man1dir = $(mandir)/man1
diff --git a/cross/avr-binutils/patches/patch-af b/cross/avr-binutils/patches/patch-af
index a59b314aad9..3c6c0420148 100644
--- a/cross/avr-binutils/patches/patch-af
+++ b/cross/avr-binutils/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.1 2003/09/19 12:34:27 wiz Exp $
+$NetBSD: patch-af,v 1.2 2009/08/27 15:26:41 hasso Exp $
 
---- gas/doc/Makefile.in.orig	Thu Jan  2 02:23:16 2003
+--- gas/doc/Makefile.in.orig	2008-08-15 10:31:50 +0200
 +++ gas/doc/Makefile.in
-@@ -181,7 +181,7 @@ CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
- TEXI2DVI = `if test -f $(top_srcdir)/../texinfo/util/texi2dvi; then echo $(top_srcdir)/../texinfo/util/texi2dvi; else echo texi2dvi; fi`
- TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex
+@@ -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
- TEXINFOS = as.texinfo 
- man1dir = $(mandir)/man1
diff --git a/cross/avr-binutils/patches/patch-ag b/cross/avr-binutils/patches/patch-ag
index ccb1099314e..438e2a17ed9 100644
--- a/cross/avr-binutils/patches/patch-ag
+++ b/cross/avr-binutils/patches/patch-ag
@@ -1,22 +1,22 @@
-$NetBSD: patch-ag,v 1.2 2003/09/19 12:58:14 wiz Exp $
+$NetBSD: patch-ag,v 1.3 2009/08/27 15:26:41 hasso Exp $
 
---- ld/Makefile.in.orig	Thu Jan  2 01:56:31 2003
+--- ld/Makefile.in.orig	2008-12-23 14:54:52 +0100
 +++ ld/Makefile.in
-@@ -111,7 +111,7 @@ INTLLIBS = @INTLLIBS@
- 
+@@ -102,7 +102,7 @@ LTYACCCOMPILE = $(LIBTOOL) --mode=compil
+ 	$(AM_YFLAGS)
+ YLWRAP = $(top_srcdir)/../ylwrap
+ SOURCES = $(ld_new_SOURCES) $(EXTRA_ld_new_SOURCES)
+-INFO_DEPS = ld.info
++INFO_DEPS =
+ TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex
+ am__TEXINFO_TEX_DIR = $(top_srcdir)/../texinfo
+ DVIS = ld.dvi
+@@ -283,7 +283,7 @@ target_vendor = @target_vendor@
+ use_sysroot = @use_sysroot@
  AUTOMAKE_OPTIONS = cygnus dejagnu
- 
+ ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
 -SUBDIRS = po
 +SUBDIRS =
- 
  tooldir = $(exec_prefix)/$(target_alias)
- 
-@@ -512,7 +512,7 @@ CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
- TEXI2DVI = `if test -f $(top_srcdir)/../texinfo/util/texi2dvi; then echo $(top_srcdir)/../texinfo/util/texi2dvi; else echo texi2dvi; fi`
- TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex
--INFO_DEPS = ld.info
-+INFO_DEPS =
- DVIS = ld.dvi
- TEXINFOS = ld.texinfo
- man1dir = $(mandir)/man1
+ YFLAGS = -d
+ AM_CFLAGS = $(WARN_CFLAGS)
diff --git a/cross/avr-binutils/patches/patch-ah b/cross/avr-binutils/patches/patch-ah
index 7b1a597ceb6..61ccce15dc3 100644
--- a/cross/avr-binutils/patches/patch-ah
+++ b/cross/avr-binutils/patches/patch-ah
@@ -1,13 +1,13 @@
-$NetBSD: patch-ah,v 1.1 2003/09/19 12:58:14 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2009/08/27 15:26:41 hasso Exp $
 
---- binutils/Makefile.in.orig	Tue Jul 16 04:04:30 2002
+--- binutils/Makefile.in.orig	2008-08-25 06:38:13 +0200
 +++ binutils/Makefile.in
-@@ -121,7 +121,7 @@ INTLLIBS = @INTLLIBS@
- 
+@@ -358,7 +358,7 @@ target_os = @target_os@
+ target_vendor = @target_vendor@
  AUTOMAKE_OPTIONS = cygnus dejagnu
- 
+ ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
 -SUBDIRS = doc po
 +SUBDIRS = doc
- 
  tooldir = $(exec_prefix)/$(target_alias)
- 
+ YFLAGS = -d
+ AM_CFLAGS = $(WARN_CFLAGS)
diff --git a/cross/avr-binutils/patches/patch-ai b/cross/avr-binutils/patches/patch-ai
index 00c25ed2b80..fd5d363dc61 100644
--- a/cross/avr-binutils/patches/patch-ai
+++ b/cross/avr-binutils/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.1 2003/09/19 12:58:15 wiz Exp $
+$NetBSD: patch-ai,v 1.2 2009/08/27 15:26:41 hasso Exp $
 
---- gas/Makefile.in.orig	Sun Jul 14 03:14:18 2002
+--- gas/Makefile.in.orig	2009-01-14 09:50:17 +0100
 +++ gas/Makefile.in
-@@ -116,7 +116,7 @@ INTLLIBS = @INTLLIBS@
- 
- AUTOMAKE_OPTIONS = cygnus dejagnu
- 
+@@ -262,7 +262,7 @@ target_vendor = @target_vendor@
+ te_file = @te_file@
+ AUTOMAKE_OPTIONS = 1.8 cygnus dejagnu
+ ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
 -SUBDIRS = doc po
 +SUBDIRS = doc
- 
- tooldir = $(exec_prefix)/$(target_alias)
- 
+ # Automake should figure this out on its own.  It doesn't, because
+ # of the "cygnus" option.  But distclean still wants it.
+ DIST_SUBDIRS = $(SUBDIRS)
diff --git a/cross/avr-binutils/patches/patch-aj b/cross/avr-binutils/patches/patch-aj
new file mode 100644
index 00000000000..d5becfcec39
--- /dev/null
+++ b/cross/avr-binutils/patches/patch-aj
@@ -0,0 +1,22 @@
+$NetBSD: patch-aj,v 1.1 2009/08/27 15:26:41 hasso Exp $
+
+--- gprof/Makefile.in.orig	2008-08-25 06:38:45 +0200
++++ gprof/Makefile.in
+@@ -94,7 +94,7 @@ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(gprof_SOURCES)
+-INFO_DEPS = gprof.info
++INFO_DEPS =
+ TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex
+ am__TEXINFO_TEX_DIR = $(top_srcdir)/../texinfo
+ DVIS = gprof.dvi
+@@ -244,7 +244,7 @@ target_vendor = @target_vendor@
+ AUTOMAKE_OPTIONS = cygnus
+ ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
+ SUFFIXES = .m
+-SUBDIRS = po
++SUBDIRS =
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
-- 
cgit v1.2.3