Bump avr-gcc from 4.4.1 to 4.5.3

(pkgsrc)
Removing:
 patches/patch-aa
   (was not to install: install-subdir at libiberty)
 patches/patch-ac
   (was not to install tree-inline.o cppdefault.o for Mac OS X,
    equivalent target does not have these files for now)
 patches/patch-gcc_toplev.h
   Upstream corrected the problem as:
   -extern inline int
   +static inline int

Adding:
 patch-gcc_config_avr_driver-avr_c
   To fix the problem like:
   error: non-void function 'avr_device_to_arch' should return a value [-Wreturn-type]
 patch-libiberty_Makefile.in
   Not install libiberty.a
   to avoid duplication (conflict) with other cross tool-chain (mef@).

(upstream)
For the changes from 4.4.1 to 4.5, see following page.
  http://gcc.gnu.org/gcc-4.5/changes.html

11 files changed, 259 insertions, 124 deletions

diff --git a/cross/avr-gcc/DESCR b/cross/avr-gcc/DESCR
index e2fe11714ef..6b37bf32b56 100644
--- a/cross/avr-gcc/DESCR
+++ b/cross/avr-gcc/DESCR
@@ -1,4 +1,4 @@
-gcc-3.0 configured as cross-compiler for Atmel AVR 8-bit RISC
+gcc-4.5 configured as cross-compiler for Atmel AVR 8-bit RISC
 microcontrollers.
 
 This package includes a basic C++ compiler, although this currently
diff --git a/cross/avr-gcc/Makefile b/cross/avr-gcc/Makefile
index 57e23e95d4d..a2b608d4121 100644
--- a/cross/avr-gcc/Makefile
+++ b/cross/avr-gcc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2013/05/31 12:39:46 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2013/08/07 03:11:35 mef Exp $
 
-DISTNAME=		gcc-4.4.1
-PKGNAME=		avr-gcc-4.4.1
-PKGREVISION=		5
+DISTNAME=		gcc-4.5.3
+PKGNAME=		avr-gcc-4.5.3
 CATEGORIES=		cross
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/releases/${DISTNAME}/}
 EXTRACT_SUFX=		.tar.bz2
@@ -10,26 +9,29 @@ DISTFILES=		${DISTNAME:S/-/-core-/}${EXTRACT_SUFX} \
 			${DISTNAME:S/-/-g++-/}${EXTRACT_SUFX}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-COMMENT=		GNU gcc-4.4 for Atmel AVR 8-bit RISC microcontrollers
+COMMENT=		GNU gcc-4.5 for Atmel AVR 8-bit RISC microcontrollers
+LICENSE=		gnu-gpl-v3
 
 DEPENDS+=		avr-binutils-[0-9]*:../../cross/avr-binutils
-BUILD_DEPENDS+=		autoconf-[0-9]*:../../devel/autoconf
 
 .include "../../mk/bsd.prefs.mk"
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		bison gmake lex perl tar msgfmt pod2man
+
+USE_TOOLS+=		bison gmake lex perl tar msgfmt autoconf pod2man
 USE_PKGLOCALEDIR=	yes
 USE_GNU_CONFIGURE_HOST=	no
 
-CONFIGURE_ARGS+=	--target=avr --disable-nls
+CONFIGURE_ARGS+=	--target=avr
+CONFIGURE_ARGS+=	--disable-nls
+CONFIGURE_ARGS+=	--enable-multilib
 
 MAKE_ENV+=		MACHINE_ARCH=avr
 MAKE_ENV+=		SHELL=${CONFIG_SHELL}
 CFLAGS_FOR_BUILD:=	${CFLAGS}
-MAVE_ENV+=		CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD:Q}
+MAKE_ENV+=		CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD:Q}
 CXXFLAGS_FOR_BUILD:=	${CXXFLAGS}
-MAVE_ENV+=		CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD:Q}
+MAKE_ENV+=		CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD:Q}
 CFLAGS=			# empty
 CXXFLAGS=		# empty
 
@@ -48,4 +50,6 @@ INSTALLATION_DIRS+=	avr/bin
 
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../math/mpfr/buildlink3.mk"
+# mpc is required since gcc-4.5.x
+.include "../../math/mpcomplex/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cross/avr-gcc/PLIST b/cross/avr-gcc/PLIST
index 76d7b446690..69cf7cb2522 100644
--- a/cross/avr-gcc/PLIST
+++ b/cross/avr-gcc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/08/27 15:29:37 hasso Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/08/07 03:11:35 mef Exp $
 avr/bin/c++
 avr/bin/g++
 avr/bin/gcc
@@ -6,52 +6,174 @@ bin/avr-c++
 bin/avr-cpp
 bin/avr-g++
 bin/avr-gcc
-bin/avr-gcc-4.4.1
+bin/${PKGNAME}
 bin/avr-gccbug
 bin/avr-gcov
-lib/gcc/avr/4.4.1/avr25/libgcc.a
-lib/gcc/avr/4.4.1/avr25/libgcov.a
-lib/gcc/avr/4.4.1/avr3/libgcc.a
-lib/gcc/avr/4.4.1/avr3/libgcov.a
-lib/gcc/avr/4.4.1/avr31/libgcc.a
-lib/gcc/avr/4.4.1/avr31/libgcov.a
-lib/gcc/avr/4.4.1/avr35/libgcc.a
-lib/gcc/avr/4.4.1/avr35/libgcov.a
-lib/gcc/avr/4.4.1/avr4/libgcc.a
-lib/gcc/avr/4.4.1/avr4/libgcov.a
-lib/gcc/avr/4.4.1/avr5/libgcc.a
-lib/gcc/avr/4.4.1/avr5/libgcov.a
-lib/gcc/avr/4.4.1/avr51/libgcc.a
-lib/gcc/avr/4.4.1/avr51/libgcov.a
-lib/gcc/avr/4.4.1/avr6/libgcc.a
-lib/gcc/avr/4.4.1/avr6/libgcov.a
-lib/gcc/avr/4.4.1/include-fixed/README
-lib/gcc/avr/4.4.1/include-fixed/limits.h
-lib/gcc/avr/4.4.1/include-fixed/syslimits.h
-lib/gcc/avr/4.4.1/include/float.h
-lib/gcc/avr/4.4.1/include/iso646.h
-lib/gcc/avr/4.4.1/include/stdarg.h
-lib/gcc/avr/4.4.1/include/stdbool.h
-lib/gcc/avr/4.4.1/include/stddef.h
-lib/gcc/avr/4.4.1/include/stdfix.h
-lib/gcc/avr/4.4.1/include/tgmath.h
-lib/gcc/avr/4.4.1/include/unwind.h
-lib/gcc/avr/4.4.1/include/varargs.h
-lib/gcc/avr/4.4.1/install-tools/fixinc_list
-lib/gcc/avr/4.4.1/install-tools/gsyslimits.h
-lib/gcc/avr/4.4.1/install-tools/include/README
-lib/gcc/avr/4.4.1/install-tools/include/limits.h
-lib/gcc/avr/4.4.1/install-tools/macro_list
-lib/gcc/avr/4.4.1/install-tools/mkheaders.conf
-lib/gcc/avr/4.4.1/libgcc.a
-lib/gcc/avr/4.4.1/libgcov.a
-libexec/gcc/avr/4.4.1/cc1
-libexec/gcc/avr/4.4.1/cc1plus
-libexec/gcc/avr/4.4.1/collect2
-libexec/gcc/avr/4.4.1/install-tools/fixinc.sh
-libexec/gcc/avr/4.4.1/install-tools/fixincl
-libexec/gcc/avr/4.4.1/install-tools/mkheaders
-libexec/gcc/avr/4.4.1/install-tools/mkinstalldirs
+lib/gcc/avr/${PKGVERSION}/avr25/libgcc.a
+lib/gcc/avr/${PKGVERSION}/avr25/libgcov.a
+lib/gcc/avr/${PKGVERSION}/avr3/libgcc.a
+lib/gcc/avr/${PKGVERSION}/avr3/libgcov.a
+lib/gcc/avr/${PKGVERSION}/avr31/libgcc.a
+lib/gcc/avr/${PKGVERSION}/avr31/libgcov.a
+lib/gcc/avr/${PKGVERSION}/avr35/libgcc.a
+lib/gcc/avr/${PKGVERSION}/avr35/libgcov.a
+lib/gcc/avr/${PKGVERSION}/avr4/libgcc.a
+lib/gcc/avr/${PKGVERSION}/avr4/libgcov.a
+lib/gcc/avr/${PKGVERSION}/avr5/libgcc.a
+lib/gcc/avr/${PKGVERSION}/avr5/libgcov.a
+lib/gcc/avr/${PKGVERSION}/avr51/libgcc.a
+lib/gcc/avr/${PKGVERSION}/avr51/libgcov.a
+lib/gcc/avr/${PKGVERSION}/avr6/libgcc.a
+lib/gcc/avr/${PKGVERSION}/avr6/libgcov.a
+lib/gcc/avr/${PKGVERSION}/include-fixed/README
+lib/gcc/avr/${PKGVERSION}/include-fixed/limits.h
+lib/gcc/avr/${PKGVERSION}/include-fixed/syslimits.h
+lib/gcc/avr/${PKGVERSION}/include/float.h
+lib/gcc/avr/${PKGVERSION}/include/iso646.h
+lib/gcc/avr/${PKGVERSION}/include/stdarg.h
+lib/gcc/avr/${PKGVERSION}/include/stdbool.h
+lib/gcc/avr/${PKGVERSION}/include/stddef.h
+lib/gcc/avr/${PKGVERSION}/include/stdfix.h
+lib/gcc/avr/${PKGVERSION}/include/stdint-gcc.h
+lib/gcc/avr/${PKGVERSION}/include/stdint.h
+lib/gcc/avr/${PKGVERSION}/include/tgmath.h
+lib/gcc/avr/${PKGVERSION}/include/unwind.h
+lib/gcc/avr/${PKGVERSION}/include/varargs.h
+lib/gcc/avr/${PKGVERSION}/install-tools/fixinc_list
+lib/gcc/avr/${PKGVERSION}/install-tools/gsyslimits.h
+lib/gcc/avr/${PKGVERSION}/install-tools/include/README
+lib/gcc/avr/${PKGVERSION}/install-tools/include/limits.h
+lib/gcc/avr/${PKGVERSION}/install-tools/macro_list
+lib/gcc/avr/${PKGVERSION}/install-tools/mkheaders.conf
+lib/gcc/avr/${PKGVERSION}/libgcc.a
+lib/gcc/avr/${PKGVERSION}/libgcov.a
+lib/gcc/avr/${PKGVERSION}/plugin/include/alias.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/all-tree.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/ansidecl.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/auto-host.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/b-header-vars
+lib/gcc/avr/${PKGVERSION}/plugin/include/basic-block.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/bitmap.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/builtins.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/bversion.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/c-common.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/c-common.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/c-pragma.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/c-pretty-print.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/cfghooks.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/cfgloop.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/cgraph.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/cif-code.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/config.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/config/avr/avr-protos.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/config/avr/avr.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/config/dbxelf.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/config/newlib-stdint.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/configargs.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/coretypes.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/cp/cp-tree.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/cp/cp-tree.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/cp/cxx-pretty-print.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/cp/name-lookup.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/cppdefault.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/cpplib.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/debug.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/defaults.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/diagnostic.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/diagnostic.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/double-int.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/emit-rtl.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/except.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/filenames.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/fixed-value.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/flags.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/function.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/gcc-plugin.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/genrtl.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/ggc.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/gimple.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/gimple.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/gsstruct.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/gtype-desc.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/hard-reg-set.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/hashtab.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/highlev-plugin-common.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/hwint.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/incpath.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/input.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/insn-constants.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/insn-flags.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/insn-modes.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/insn-notes.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/intl.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/ipa-prop.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/ipa-reference.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/ipa-utils.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/langhooks.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/libiberty.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/line-map.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/machmode.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/md5.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/mode-classes.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/obstack.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/omp-builtins.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/options.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/opts.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/output.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/params.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/params.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/partition.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/plugin-version.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/plugin.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/plugin.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/pointer-set.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/predict.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/predict.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/prefix.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/pretty-print.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/real.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/reg-notes.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/rtl.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/rtl.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/safe-ctype.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/sbitmap.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/splay-tree.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/statistics.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/symtab.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/sync-builtins.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/system.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/target.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/timevar.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/timevar.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/tm-preds.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/tm.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/tm_p.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/toplev.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/tree-check.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/tree-dump.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/tree-flow-inline.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/tree-flow.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/tree-inline.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/tree-iterator.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/tree-pass.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/tree-ssa-alias.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/tree-ssa-operands.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/tree-ssa-sccvn.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/tree.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/tree.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/treestruct.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/varray.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/vec.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/vecprim.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/version.h
+libexec/gcc/avr/${PKGVERSION}/cc1
+libexec/gcc/avr/${PKGVERSION}/cc1plus
+libexec/gcc/avr/${PKGVERSION}/collect2
+libexec/gcc/avr/${PKGVERSION}/install-tools/fixinc.sh
+libexec/gcc/avr/${PKGVERSION}/install-tools/fixincl
+libexec/gcc/avr/${PKGVERSION}/install-tools/mkheaders
+libexec/gcc/avr/${PKGVERSION}/install-tools/mkinstalldirs
+libexec/gcc/avr/${PKGVERSION}/lto-wrapper
 man/man1/avr-cpp.1
 man/man1/avr-g++.1
 man/man1/avr-gcc.1
diff --git a/cross/avr-gcc/distinfo b/cross/avr-gcc/distinfo
index 9fd1f49feee..a164c3181cd 100644
--- a/cross/avr-gcc/distinfo
+++ b/cross/avr-gcc/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.7 2012/12/12 23:44:40 dsainty Exp $
+$NetBSD: distinfo,v 1.8 2013/08/07 03:11:35 mef Exp $
 
-SHA1 (gcc-core-4.4.1.tar.bz2) = 7e18b5f49b77a78e0ccd31c82c6220c5756da754
-RMD160 (gcc-core-4.4.1.tar.bz2) = 6545aea8ad1c9ae55cb0f12991456a0dd3bc490d
-Size (gcc-core-4.4.1.tar.bz2) = 25747208 bytes
-SHA1 (gcc-g++-4.4.1.tar.bz2) = 921c8c18287cabc4c515b4a52c70e445160bd161
-RMD160 (gcc-g++-4.4.1.tar.bz2) = 67b2774d14eea8272b214f0d879e70fb6920b3bf
-Size (gcc-g++-4.4.1.tar.bz2) = 5936040 bytes
-SHA1 (patch-aa) = 17ee1942842186c4336d72bb8223bdb3023c85c1
-SHA1 (patch-ab) = 4a3ab9719a6714933954a120ad8c594c3a4a2e1f
-SHA1 (patch-ac) = 14dbe72be88bd6fb0fd8671494454a6d4c11c4b7
-SHA1 (patch-gcc_cp_cfns.h) = 747e918b167d120965de09f9ef3b563e8f8afdf6
-SHA1 (patch-gcc_toplev.h) = 4378a41650336b91b376fcf158570290e1ef3714
+SHA1 (gcc-core-4.5.3.tar.bz2) = 5edd2a4ae5a265df716550079995c0a0bc7be564
+RMD160 (gcc-core-4.5.3.tar.bz2) = ef6b9cddc3bcd9884766645659d03f460aab443d
+Size (gcc-core-4.5.3.tar.bz2) = 28252641 bytes
+SHA1 (gcc-g++-4.5.3.tar.bz2) = fde6d16c2d4a2ab21abeaa7dc8e73e22557e8a2d
+RMD160 (gcc-g++-4.5.3.tar.bz2) = 5ef37a35671b475c1f86962dfa796133c80e6549
+Size (gcc-g++-4.5.3.tar.bz2) = 6475820 bytes
+SHA1 (patch-ab) = 4396719b8398cf9eb1f939c447dede250ceb4e26
+SHA1 (patch-gcc_config_avr_driver-avr_c) = 882b1ef0f9bb12338e1b0de2941d2d4164039082
+SHA1 (patch-gcc_cp_cfns.h) = d657e8ecde1fc73eebccb4f790f3b266ee2d7a6d
+SHA1 (patch-libiberty_Makefile.in) = 063c763dc379faf5c74cd0d50ec0d8e26f246bb0
diff --git a/cross/avr-gcc/patches/patch-aa b/cross/avr-gcc/patches/patch-aa
deleted file mode 100644
index c1108129ddb..00000000000
--- a/cross/avr-gcc/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2009/08/27 15:29:37 hasso Exp $
-
---- libiberty/Makefile.in.orig	2008-10-22 15:30:19 +0200
-+++ libiberty/Makefile.in
-@@ -346,7 +346,8 @@ libiberty.html : $(srcdir)/libiberty.tex
- @MAINT@	echo stamp > stamp-functions
- 
- INSTALL_DEST = @INSTALL_DEST@
--install: install_to_$(INSTALL_DEST) install-subdir
-+#install: install_to_$(INSTALL_DEST) install-subdir
-+install:
- 
- # 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-gcc/patches/patch-ab b/cross/avr-gcc/patches/patch-ab
index ee1aba950a7..e61ee79a378 100644
--- a/cross/avr-gcc/patches/patch-ab
+++ b/cross/avr-gcc/patches/patch-ab
@@ -1,4 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2009/08/27 15:29:37 hasso Exp $
+$NetBSD: patch-ab,v 1.3 2013/08/07 03:11:35 mef Exp $
+
+See Makefile for following part. Honor ${TOOLS_PATH.sed}
+SUBST_CLASSES+=		sed
 
 --- fixincludes/fixincl.x.orig	2009-08-27 00:05:13 +0300
 +++ fixincludes/fixincl.x	2009-08-27 00:05:32 +0300
diff --git a/cross/avr-gcc/patches/patch-ac b/cross/avr-gcc/patches/patch-ac
deleted file mode 100644
index ea519ab98aa..00000000000
--- a/cross/avr-gcc/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2010/06/20 22:20:18 tron Exp $
-
-Avoid linking "tree-inline.o" twice which breaks the build under Mac OS X.
-
---- gcc/cp/Make-lang.in.orig	2008-12-05 08:01:58.000000000 +0000
-+++ gcc/cp/Make-lang.in	2010-06-20 23:11:07.000000000 +0100
-@@ -72,8 +72,8 @@
- # Shared with C front end:
- CXX_C_OBJS = attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o \
- 	c-dump.o $(CXX_TARGET_OBJS) c-pretty-print.o c-opts.o c-pch.o \
--	incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o \
--	c-gimplify.o c-omp.o tree-inline.o
-+	incpath.o c-ppoutput.o c-cppbuiltin.o prefix.o \
-+	c-gimplify.o c-omp.o
- 
- # Language-specific object files for C++ and Objective C++.
- CXX_AND_OBJCXX_OBJS = cp/call.o cp/decl.o cp/expr.o cp/pt.o cp/typeck2.o \
diff --git a/cross/avr-gcc/patches/patch-gcc_config_avr_driver-avr_c b/cross/avr-gcc/patches/patch-gcc_config_avr_driver-avr_c
new file mode 100644
index 00000000000..b256947d199
--- /dev/null
+++ b/cross/avr-gcc/patches/patch-gcc_config_avr_driver-avr_c
@@ -0,0 +1,42 @@
+$NetBSD: patch-gcc_config_avr_driver-avr_c,v 1.1 2013/08/07 03:11:35 mef Exp $
+
+gcc-4.5.3/gcc/config/avr/driver-avr.c:58:5: error: non-void function 'avr_device_to_arch' should return a value [-Wreturn-type]
+
+--- gcc/config/avr/driver-avr.c.orig	2009-06-24 04:14:11.000000000 +0900
++++ gcc/config/avr/driver-avr.c	2013-07-04 17:47:24.000000000 +0900
+@@ -55,7 +55,7 @@ const char *
+ avr_device_to_arch (int argc, const char **argv)
+ {
+   if (0 == argc)
+-    return;
++    return NULL;
+ 
+   avr_set_current_device (argv[0]);
+ 
+@@ -71,7 +71,7 @@ avr_device_to_data_start (int argc, cons
+   char data_section_start_str[16];
+ 
+   if (0 == argc)
+-    return;  
++    return NULL;  
+ 
+   avr_set_current_device (argv[0]);
+   
+@@ -93,7 +93,7 @@ const char *
+ avr_device_to_startfiles (int argc, const char **argv)
+ {
+   if (0 == argc)
+-    return;
++    return NULL;
+ 
+   avr_set_current_device (argv[0]);
+ 
+@@ -106,7 +106,7 @@ const char *
+ avr_device_to_devicelib (int argc, const char **argv)
+ {
+   if (0 == argc)
+-    return;
++    return NULL;
+ 
+   avr_set_current_device (argv[0]);
+ 
diff --git a/cross/avr-gcc/patches/patch-gcc_cp_cfns.h b/cross/avr-gcc/patches/patch-gcc_cp_cfns.h
index 2a5f3d2d6d6..402d204e68b 100644
--- a/cross/avr-gcc/patches/patch-gcc_cp_cfns.h
+++ b/cross/avr-gcc/patches/patch-gcc_cp_cfns.h
@@ -1,4 +1,7 @@
-$NetBSD: patch-gcc_cp_cfns.h,v 1.2 2012/12/12 23:44:40 dsainty Exp $
+$NetBSD: patch-gcc_cp_cfns.h,v 1.3 2013/08/07 03:11:35 mef Exp $
+
+date: 2012-11-16 09:38:21 +0900;  author: joerg;  state: Exp;
+Fix inline usage.
 
 --- gcc/cp/cfns.h.orig	2012-11-14 17:13:55.000000000 +0000
 +++ gcc/cp/cfns.h
diff --git a/cross/avr-gcc/patches/patch-gcc_toplev.h b/cross/avr-gcc/patches/patch-gcc_toplev.h
deleted file mode 100644
index c3cd951ccaa..00000000000
--- a/cross/avr-gcc/patches/patch-gcc_toplev.h
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-gcc_toplev.h,v 1.1 2012/11/16 00:38:21 joerg Exp $
-
---- gcc/toplev.h.orig	2012-11-14 17:06:44.000000000 +0000
-+++ gcc/toplev.h
-@@ -185,18 +185,6 @@ extern int floor_log2                  (
- #  define CLZ_HWI __builtin_clz
- #  define CTZ_HWI __builtin_ctz
- # endif
--
--extern inline int
--floor_log2 (unsigned HOST_WIDE_INT x)
--{
--  return x ? HOST_BITS_PER_WIDE_INT - 1 - (int) CLZ_HWI (x) : -1;
--}
--
--extern inline int
--exact_log2 (unsigned HOST_WIDE_INT x)
--{
--  return x == (x & -x) && x ? (int) CTZ_HWI (x) : -1;
--}
- #endif /* GCC_VERSION >= 3004 */
- 
- /* Functions used to get and set GCC's notion of in what directory
diff --git a/cross/avr-gcc/patches/patch-libiberty_Makefile.in b/cross/avr-gcc/patches/patch-libiberty_Makefile.in
new file mode 100644
index 00000000000..cc5cdf23984
--- /dev/null
+++ b/cross/avr-gcc/patches/patch-libiberty_Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-libiberty_Makefile.in,v 1.1 2013/08/07 03:11:35 mef Exp $
+
+To avoid duplication (conflict) with other cross tool-chain,
+just not install libiberty.a
+
+--- libiberty/Makefile.in.orig	2010-03-02 15:09:56.000000000 +0900
++++ libiberty/Makefile.in	2013-07-04 12:01:10.000000000 +0900
+@@ -321,7 +321,7 @@ libiberty.html : $(srcdir)/libiberty.tex
+ @MAINT@	echo stamp > stamp-functions
+ 
+ INSTALL_DEST = @INSTALL_DEST@
+-install: install_to_$(INSTALL_DEST) install-subdir
++install: 
+ 
+ # This is tricky.  Even though CC in the Makefile contains
+ # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the