PR pkg/48890 was proposed. Thanks. But this commit is slightly

different from the PR (When submitting patch to pkgsrc with
adding more patches, submitter should do cvs add
patches/patch-hoge, before creating the pkgsrc patch, thanks).

I belive both simulavr and avr-libc will be packaged fine with this.
(upstream)
4.7.3 to 4.8.3  -- From grepping 'avr' from NEWS file:
--------------
   On AVR, the configure option --with-avrlibc supported since GCC 4.7.2
   is turned on per default for all non-RTEMS configurations. This option
   arranges for a better integration of [3]AVR Libc with avr-gcc. For
   technical details, see [4]PR54461. To turn off the option in non-RTEMS
   configurations, use --with-avrlibc=no. If the compiler is configured
   for RTEMS, the option is always turned off.

     * Support has been added for the AVR-specific configure option
       --with-avrlibc=yes in order to arrange for better integration of
       [3]AVR-Libc. This configure option is supported in avr-gcc 4.7.2
       and newer and will only take effect in non-RTEMS configurations. If
       avr-gcc is configured for RTEMS, the option will be ignored which
       is the same as specifying --with-avrlibc=no. See [4]PR54461 for
       more technical details.

   3. http://www.nongnu.org/avr-libc/
   4. http://gcc.gnu.org/PR54461

#include <avr/io.h> /* Port Definitions from AVR-LibC */

     * [297]14064 [avr-elf] -fdata-sections triggers ICE
     * [302]16884 [avr-elf] [fweb related] bug while initializing

4.5.3 to 4.7.3
--------------
 For the changes for 4.7, see following page.
  http://gcc.gnu.org/gcc-4.7/changes.html

(Picking up AVR related topic from above info):
The AVR port's libgcc has been improved and its multilib
structure has been enhanced. As a result, all objects
contributing to an application must either be compiled with
GCC versions up to 4.6.x or with GCC versions 4.7.1 or
later. If the compiler is used with AVR Libc, you need a
version that supports the new layout, i.e. implements #35407.

The AVR port's -mshort-calls command-line option has been
deprecated. It will be removed in the GCC 4.8 release. See
-mrelax for a replacement.

The AVR port only references startup code that clears .bss and
the common section resp. initializes the .data and .rodata
section provided respective sections (or subsections thereof)
are not empty, see PR18145.
  Applications that put all static storage objects into
non-standard sections and / or define all static storage
objects in assembler modules, must reference __do_clear_bss
resp. __do_copy_data by hand or undefine the symbol(s) by
means of -Wl,-u,__do_clear_bss resp. -Wl,-u,__do_copy_data.

6 files changed, 81 insertions, 89 deletions

diff --git a/cross/avr-gcc/Makefile b/cross/avr-gcc/Makefile
index 32e42b18324..0add1155809 100644
--- a/cross/avr-gcc/Makefile
+++ b/cross/avr-gcc/Makefile
@@ -1,17 +1,14 @@
-# $NetBSD: Makefile,v 1.34 2014/05/29 23:35:24 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2014/08/29 04:26:46 mef Exp $
 
-DISTNAME=		gcc-4.5.3
-PKGNAME=		avr-gcc-4.5.3
-PKGREVISION=		2
+DISTNAME=		gcc-4.8.3
+PKGNAME=		${DISTNAME:C/^/avr-/}
 CATEGORIES=		cross
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/releases/${DISTNAME}/}
 EXTRACT_SUFX=		.tar.bz2
-DISTFILES=		${DISTNAME:S/-/-core-/}${EXTRACT_SUFX} \
-			${DISTNAME:S/-/-g++-/}${EXTRACT_SUFX}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-COMMENT=		GNU gcc-4.5 for Atmel AVR 8-bit RISC microcontrollers
-LICENSE=		gnu-gpl-v3
+COMMENT=		GNU gcc-4.8 for Atmel AVR 8-bit RISC microcontrollers
+LICENSE=		gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
 
 DEPENDS+=		avr-binutils-[0-9]*:../../cross/avr-binutils
 
@@ -19,14 +16,18 @@ DEPENDS+=		avr-binutils-[0-9]*:../../cross/avr-binutils
 
 GNU_CONFIGURE=		yes
 
+USE_LANGUAGES=		c c++
 USE_TOOLS+=		bison gmake lex perl tar msgfmt autoconf pod2man
 USE_PKGLOCALEDIR=	yes
 USE_GNU_CONFIGURE_HOST=	no
 
 CONFIGURE_ARGS+=	--target=avr
+CONFIGURE_ARGS+=	--enable-languages='c c++'
 CONFIGURE_ARGS+=	--disable-nls --disable-lto
+CONFIGURE_ARGS+=	--disable-libquadmath-support
 CONFIGURE_ARGS+=	--enable-multilib
 CONFIGURE_ARGS+=	--with-system-zlib
+CONFIGURE_ARGS+=	--disable-threads
 
 MAKE_ENV+=		MACHINE_ARCH=avr
 MAKE_ENV+=		SHELL=${CONFIG_SHELL}
@@ -46,6 +47,11 @@ pre-configure:
 	${MKDIR} ${WRKDIR}/obj
 	${LN} -s ${WRKDIR}/obj/gcc/include/unwind.h ${WRKSRC}/gcc/unwind.h
 
+# To avoid the conflict with other cross and native compiler
+post-install:
+	(cd ${DESTDIR}${PREFIX}/lib; \
+	 ${MV} libiberty.a gcc/avr/ )
+
 CONFIGURE_DIRS=		${WRKDIR}/obj
 CONFIGURE_SCRIPT=	${WRKSRC}/configure
 
diff --git a/cross/avr-gcc/PLIST b/cross/avr-gcc/PLIST
index 69cf7cb2522..6eff7abbd14 100644
--- a/cross/avr-gcc/PLIST
+++ b/cross/avr-gcc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2013/08/07 03:11:35 mef Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/08/29 04:26:46 mef Exp $
 avr/bin/c++
 avr/bin/g++
 avr/bin/gcc
@@ -7,10 +7,14 @@ bin/avr-cpp
 bin/avr-g++
 bin/avr-gcc
 bin/${PKGNAME}
-bin/avr-gccbug
+bin/avr-gcc-ar
+bin/avr-gcc-nm
+bin/avr-gcc-ranlib
 bin/avr-gcov
 lib/gcc/avr/${PKGVERSION}/avr25/libgcc.a
 lib/gcc/avr/${PKGVERSION}/avr25/libgcov.a
+lib/gcc/avr/${PKGVERSION}/avr25/tiny-stack/libgcc.a
+lib/gcc/avr/${PKGVERSION}/avr25/tiny-stack/libgcov.a
 lib/gcc/avr/${PKGVERSION}/avr3/libgcc.a
 lib/gcc/avr/${PKGVERSION}/avr3/libgcov.a
 lib/gcc/avr/${PKGVERSION}/avr31/libgcc.a
@@ -25,18 +29,30 @@ 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}/avrxmega2/libgcc.a
+lib/gcc/avr/${PKGVERSION}/avrxmega2/libgcov.a
+lib/gcc/avr/${PKGVERSION}/avrxmega4/libgcc.a
+lib/gcc/avr/${PKGVERSION}/avrxmega4/libgcov.a
+lib/gcc/avr/${PKGVERSION}/avrxmega5/libgcc.a
+lib/gcc/avr/${PKGVERSION}/avrxmega5/libgcov.a
+lib/gcc/avr/${PKGVERSION}/avrxmega6/libgcc.a
+lib/gcc/avr/${PKGVERSION}/avrxmega6/libgcov.a
+lib/gcc/avr/${PKGVERSION}/avrxmega7/libgcc.a
+lib/gcc/avr/${PKGVERSION}/avrxmega7/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/stdalign.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-gcc.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/stdnoreturn.h
 lib/gcc/avr/${PKGVERSION}/include/unwind.h
 lib/gcc/avr/${PKGVERSION}/include/varargs.h
 lib/gcc/avr/${PKGVERSION}/install-tools/fixinc_list
@@ -47,8 +63,12 @@ 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/libiberty.a
+lib/gcc/avr/${PKGVERSION}/plugin/gtype.state
+lib/gcc/avr/${PKGVERSION}/plugin/include/ada/gcc-interface/ada-tree.def
 lib/gcc/avr/${PKGVERSION}/plugin/include/alias.h
 lib/gcc/avr/${PKGVERSION}/plugin/include/all-tree.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/alloc-pool.h
 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
@@ -56,19 +76,27 @@ 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/c-family/c-common.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/c-family/c-common.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/c-family/c-objc.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/c-family/c-pragma.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/c-family/c-pretty-print.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/c-tree.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/cfg-flags.def
 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-arch.h
 lib/gcc/avr/${PKGVERSION}/plugin/include/config/avr/avr-protos.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/config/avr/avr-stdint.h
 lib/gcc/avr/${PKGVERSION}/plugin/include/config/avr/avr.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/config/avr/avrlibc.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/config/avr/elf.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/config/elfos.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/config/initfini-array.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
@@ -79,21 +107,26 @@ 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-core.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/dumpfile.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/flag-types.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-pretty-print.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/gtm-builtins.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
@@ -105,16 +138,23 @@ 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/internal-fn.def
+lib/gcc/avr/${PKGVERSION}/plugin/include/internal-fn.h
 lib/gcc/avr/${PKGVERSION}/plugin/include/intl.h
 lib/gcc/avr/${PKGVERSION}/plugin/include/ipa-prop.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/ipa-ref-inline.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/ipa-ref.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/is-a.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/java/java-tree.def
 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/objc/objc-tree.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
@@ -122,7 +162,7 @@ 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-api.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
@@ -132,16 +172,20 @@ 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/realmpfr.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/sanitizer.def
 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-hooks-macros.h
+lib/gcc/avr/${PKGVERSION}/plugin/include/target.def
 lib/gcc/avr/${PKGVERSION}/plugin/include/target.h
 lib/gcc/avr/${PKGVERSION}/plugin/include/timevar.def
 lib/gcc/avr/${PKGVERSION}/plugin/include/timevar.h
@@ -156,16 +200,17 @@ 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-pretty-print.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
+lib/gcc/avr/${PKGVERSION}/tiny-stack/libgcc.a
+lib/gcc/avr/${PKGVERSION}/tiny-stack/libgcov.a
 libexec/gcc/avr/${PKGVERSION}/cc1
 libexec/gcc/avr/${PKGVERSION}/cc1plus
 libexec/gcc/avr/${PKGVERSION}/collect2
@@ -174,6 +219,7 @@ 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
+libexec/gcc/avr/${PKGVERSION}/plugin/gengtype
 man/man1/avr-cpp.1
 man/man1/avr-g++.1
 man/man1/avr-gcc.1
@@ -181,3 +227,4 @@ man/man1/avr-gcov.1
 man/man7/fsf-funding.7
 man/man7/gfdl.7
 man/man7/gpl.7
+@pkgdir share/info
diff --git a/cross/avr-gcc/buildlink3.mk b/cross/avr-gcc/buildlink3.mk
index ee34b65e482..6106dd6bc2e 100644
--- a/cross/avr-gcc/buildlink3.mk
+++ b/cross/avr-gcc/buildlink3.mk
@@ -1,13 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/08/08 03:14:57 mef Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2014/08/29 04:26:46 mef Exp $
 
 BUILDLINK_TREE+=	avr-gcc
 
 .if !defined(AVR_GCC_BUILDLINK3_MK)
 AVR_GCC_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.avr-gcc+=		avr-gcc>=4.5.3
+BUILDLINK_API_DEPENDS.avr-gcc+=		avr-gcc>=4.8.3
 BUILDLINK_PKGSRCDIR.avr-gcc?=		../../cross/avr-gcc
-BUILDLINK_FNAME_TRANSFORM.avr-gcc+=	-e "s,${AVR_TARGET}/lib,lib/,g"
+# Folling line was harmful, .buildlink/lib/ -> buildlinklib/
+# It did not have first ending slash, probably was OK.
+#BUILDLINK_FNAME_TRANSFORM.avr-gcc+=	-e "s,${AVR_TARGET}/lib/,lib/,g"
 
 .endif # AVR_GCC_BUILDLINK3_MK
 
diff --git a/cross/avr-gcc/distinfo b/cross/avr-gcc/distinfo
index a164c3181cd..a3ce2f0bf30 100644
--- a/cross/avr-gcc/distinfo
+++ b/cross/avr-gcc/distinfo
@@ -1,12 +1,7 @@
-$NetBSD: distinfo,v 1.8 2013/08/07 03:11:35 mef Exp $
+$NetBSD: distinfo,v 1.9 2014/08/29 04:26:46 mef Exp $
 
-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 (gcc-4.8.3.tar.bz2) = da0a2b9ec074f2bf624a34f3507f812ebb6e4dce
+RMD160 (gcc-4.8.3.tar.bz2) = 2c7214ff607cbe822282c04d1d6f9fea765c82c5
+Size (gcc-4.8.3.tar.bz2) = 86126808 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-gcc_config_avr_driver-avr_c b/cross/avr-gcc/patches/patch-gcc_config_avr_driver-avr_c
deleted file mode 100644
index b256947d199..00000000000
--- a/cross/avr-gcc/patches/patch-gcc_config_avr_driver-avr_c
+++ /dev/null
@@ -1,42 +0,0 @@
-$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-libiberty_Makefile.in b/cross/avr-gcc/patches/patch-libiberty_Makefile.in
deleted file mode 100644
index cc5cdf23984..00000000000
--- a/cross/avr-gcc/patches/patch-libiberty_Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$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