Import of pkgsrc-2015Q1

2015-04-22 14:34:26 +02:00
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions
--- a/cross/COMMON/PLIST-binutils
+++ b/cross/COMMON/PLIST-binutils
@@ -1,23 +0,0 @@
-@comment $NetBSD: PLIST-binutils,v 1.2 1999/01/04 22:37:30 tv Exp $
-bin/${TARGET_ARCH}-addr2line
-bin/${TARGET_ARCH}-ar
-bin/${TARGET_ARCH}-as
-bin/${TARGET_ARCH}-ld
-bin/${TARGET_ARCH}-nm
-bin/${TARGET_ARCH}-objcopy
-bin/${TARGET_ARCH}-objdump
-bin/${TARGET_ARCH}-ranlib
-bin/${TARGET_ARCH}-size
-bin/${TARGET_ARCH}-strings
-bin/${TARGET_ARCH}-strip
-${TARGET_ARCH}/bin/addr2line
-${TARGET_ARCH}/bin/ar
-${TARGET_ARCH}/bin/as
-${TARGET_ARCH}/bin/ld
-${TARGET_ARCH}/bin/nm
-${TARGET_ARCH}/bin/objcopy
-${TARGET_ARCH}/bin/objdump
-${TARGET_ARCH}/bin/ranlib
-${TARGET_ARCH}/bin/size
-${TARGET_ARCH}/bin/strings
-${TARGET_ARCH}/bin/strip
--- a/cross/COMMON/PLIST-egcs
+++ b/cross/COMMON/PLIST-egcs
@@ -1,42 +0,0 @@
-@comment $NetBSD: PLIST-egcs,v 1.5 2009/06/14 18:34:00 joerg Exp $
-${TARGET_ARCH}/bin/cc
-${TARGET_ARCH}/bin/gcc
-bin/${TARGET_ARCH}-cc
-bin/${TARGET_ARCH}-gcc
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/cc1
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/collect2
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/cpp
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/README
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/exception
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/float.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/iso646.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/limits.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/new
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/new.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/proto.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/stdarg.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/stdbool.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/stddef.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/syslimits.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/typeinfo
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/va-alpha.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/va-arc.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/va-clipper.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/va-h8300.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/va-i860.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/va-i960.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/va-m32r.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/va-m88k.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/va-mips.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/va-mn10200.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/va-mn10300.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/va-pa.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/va-ppc.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/va-pyr.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/va-sh.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/va-sparc.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/va-spur.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/va-v850.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/varargs.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/libgcc.a
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/specs
--- a/cross/COMMON/PLIST-egcs-cxx
+++ b/cross/COMMON/PLIST-egcs-cxx
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST-egcs-cxx,v 1.1 1999/01/06 01:14:20 tv Exp $
-${TARGET_ARCH}/bin/c++
-${TARGET_ARCH}/bin/c++filt
-${TARGET_ARCH}/bin/g++
-bin/${TARGET_ARCH}-c++
-bin/${TARGET_ARCH}-c++filt
-bin/${TARGET_ARCH}-g++
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/cc1plus
--- a/cross/COMMON/PLIST-egcs-cxx-runtime
+++ b/cross/COMMON/PLIST-egcs-cxx-runtime
@@ -1,114 +0,0 @@
-@comment $NetBSD: PLIST-egcs-cxx-runtime,v 1.2 2009/06/14 17:39:52 joerg Exp $
-${TARGET_ARCH}/include/g++/algo.h
-${TARGET_ARCH}/include/g++/algobase.h
-${TARGET_ARCH}/include/g++/algorithm
-${TARGET_ARCH}/include/g++/alloc.h
-${TARGET_ARCH}/include/g++/bvector.h
-${TARGET_ARCH}/include/g++/cassert
-${TARGET_ARCH}/include/g++/cctype
-${TARGET_ARCH}/include/g++/cerrno
-${TARGET_ARCH}/include/g++/cfloat
-${TARGET_ARCH}/include/g++/ciso646
-${TARGET_ARCH}/include/g++/climits
-${TARGET_ARCH}/include/g++/clocale
-${TARGET_ARCH}/include/g++/cmath
-${TARGET_ARCH}/include/g++/complex
-${TARGET_ARCH}/include/g++/complex.h
-${TARGET_ARCH}/include/g++/csetjmp
-${TARGET_ARCH}/include/g++/csignal
-${TARGET_ARCH}/include/g++/cstdarg
-${TARGET_ARCH}/include/g++/cstddef
-${TARGET_ARCH}/include/g++/cstdio
-${TARGET_ARCH}/include/g++/cstdlib
-${TARGET_ARCH}/include/g++/cstring
-${TARGET_ARCH}/include/g++/ctime
-${TARGET_ARCH}/include/g++/cwchar
-${TARGET_ARCH}/include/g++/cwctype
-${TARGET_ARCH}/include/g++/defalloc.h
-${TARGET_ARCH}/include/g++/deque
-${TARGET_ARCH}/include/g++/deque.h
-${TARGET_ARCH}/include/g++/fstream
-${TARGET_ARCH}/include/g++/function.h
-${TARGET_ARCH}/include/g++/functional
-${TARGET_ARCH}/include/g++/hash_map
-${TARGET_ARCH}/include/g++/hash_map.h
-${TARGET_ARCH}/include/g++/hash_set
-${TARGET_ARCH}/include/g++/hash_set.h
-${TARGET_ARCH}/include/g++/hashtable.h
-${TARGET_ARCH}/include/g++/heap.h
-${TARGET_ARCH}/include/g++/iomanip
-${TARGET_ARCH}/include/g++/iosfwd
-${TARGET_ARCH}/include/g++/iostream
-${TARGET_ARCH}/include/g++/iterator
-${TARGET_ARCH}/include/g++/iterator.h
-${TARGET_ARCH}/include/g++/list
-${TARGET_ARCH}/include/g++/list.h
-${TARGET_ARCH}/include/g++/map
-${TARGET_ARCH}/include/g++/map.h
-${TARGET_ARCH}/include/g++/memory
-${TARGET_ARCH}/include/g++/multimap.h
-${TARGET_ARCH}/include/g++/multiset.h
-${TARGET_ARCH}/include/g++/numeric
-${TARGET_ARCH}/include/g++/pair.h
-${TARGET_ARCH}/include/g++/pthread_alloc
-${TARGET_ARCH}/include/g++/pthread_alloc.h
-${TARGET_ARCH}/include/g++/queue
-${TARGET_ARCH}/include/g++/rope
-${TARGET_ARCH}/include/g++/rope.h
-${TARGET_ARCH}/include/g++/ropeimpl.h
-${TARGET_ARCH}/include/g++/set
-${TARGET_ARCH}/include/g++/set.h
-${TARGET_ARCH}/include/g++/slist
-${TARGET_ARCH}/include/g++/slist.h
-${TARGET_ARCH}/include/g++/stack
-${TARGET_ARCH}/include/g++/stack.h
-${TARGET_ARCH}/include/g++/std/bastring.cc
-${TARGET_ARCH}/include/g++/std/bastring.h
-${TARGET_ARCH}/include/g++/std/complext.cc
-${TARGET_ARCH}/include/g++/std/complext.h
-${TARGET_ARCH}/include/g++/std/dcomplex.h
-${TARGET_ARCH}/include/g++/std/fcomplex.h
-${TARGET_ARCH}/include/g++/std/ldcomplex.h
-${TARGET_ARCH}/include/g++/std/straits.h
-${TARGET_ARCH}/include/g++/stdexcept
-${TARGET_ARCH}/include/g++/stl.h
-${TARGET_ARCH}/include/g++/stl_algo.h
-${TARGET_ARCH}/include/g++/stl_algobase.h
-${TARGET_ARCH}/include/g++/stl_alloc.h
-${TARGET_ARCH}/include/g++/stl_bvector.h
-${TARGET_ARCH}/include/g++/stl_config.h
-${TARGET_ARCH}/include/g++/stl_construct.h
-${TARGET_ARCH}/include/g++/stl_deque.h
-${TARGET_ARCH}/include/g++/stl_function.h
-${TARGET_ARCH}/include/g++/stl_hash_fun.h
-${TARGET_ARCH}/include/g++/stl_hash_map.h
-${TARGET_ARCH}/include/g++/stl_hash_set.h
-${TARGET_ARCH}/include/g++/stl_hashtable.h
-${TARGET_ARCH}/include/g++/stl_heap.h
-${TARGET_ARCH}/include/g++/stl_iterator.h
-${TARGET_ARCH}/include/g++/stl_list.h
-${TARGET_ARCH}/include/g++/stl_map.h
-${TARGET_ARCH}/include/g++/stl_multimap.h
-${TARGET_ARCH}/include/g++/stl_multiset.h
-${TARGET_ARCH}/include/g++/stl_numeric.h
-${TARGET_ARCH}/include/g++/stl_pair.h
-${TARGET_ARCH}/include/g++/stl_queue.h
-${TARGET_ARCH}/include/g++/stl_raw_storage_iter.h
-${TARGET_ARCH}/include/g++/stl_relops.h
-${TARGET_ARCH}/include/g++/stl_rope.h
-${TARGET_ARCH}/include/g++/stl_set.h
-${TARGET_ARCH}/include/g++/stl_slist.h
-${TARGET_ARCH}/include/g++/stl_stack.h
-${TARGET_ARCH}/include/g++/stl_tempbuf.h
-${TARGET_ARCH}/include/g++/stl_tree.h
-${TARGET_ARCH}/include/g++/stl_uninitialized.h
-${TARGET_ARCH}/include/g++/stl_vector.h
-${TARGET_ARCH}/include/g++/string
-${TARGET_ARCH}/include/g++/strstream
-${TARGET_ARCH}/include/g++/tempbuf.h
-${TARGET_ARCH}/include/g++/tree.h
-${TARGET_ARCH}/include/g++/type_traits.h
-${TARGET_ARCH}/include/g++/utility
-${TARGET_ARCH}/include/g++/vector
-${TARGET_ARCH}/include/g++/vector.h
-${TARGET_ARCH}/lib/libstdc++.a
--- a/cross/COMMON/PLIST-egcs-f77
+++ b/cross/COMMON/PLIST-egcs-f77
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST-egcs-f77,v 1.1 1999/01/06 01:14:20 tv Exp $
-${TARGET_ARCH}/bin/f77
-${TARGET_ARCH}/bin/fort77
-${TARGET_ARCH}/bin/g77
-bin/${TARGET_ARCH}-f77
-bin/${TARGET_ARCH}-fort77
-bin/${TARGET_ARCH}-g77
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/f771
--- a/cross/COMMON/PLIST-egcs-f77-runtime
+++ b/cross/COMMON/PLIST-egcs-f77-runtime
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST-egcs-f77-runtime,v 1.1 1999/01/06 01:14:20 tv Exp $
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g2c.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/libg2c.a
--- a/cross/COMMON/PLIST-egcs-objc
+++ b/cross/COMMON/PLIST-egcs-objc
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST-egcs-objc,v 1.1 1999/01/06 01:14:20 tv Exp $
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/cc1obj
--- a/cross/COMMON/PLIST-egcs-objc-runtime
+++ b/cross/COMMON/PLIST-egcs-objc-runtime
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST-egcs-objc-runtime,v 1.2 2009/06/14 17:39:52 joerg Exp $
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/NXConstStr.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/Object.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/Protocol.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/encoding.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/hash.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/objc-api.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/objc-list.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/objc.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/sarray.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/thr.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/typedstream.h
--- a/cross/COMMON/buwrapper.c
+++ b/cross/COMMON/buwrapper.c
@@ -1,50 +0,0 @@
-/*	$NetBSD: buwrapper.c,v 1.2 1999/01/04 22:51:53 tv Exp $	*/
-
-#include <err.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sysexits.h>
-#include <unistd.h>
-
-/*
- * Wrapper for binutils programs.
- *
- * This frontend sets the appropriate environment variables that tell
- * binutils programs which target will be used.
- */
-
-static const char binsubdir[] = "libexec/binutils";
-
-#define PATHLEN sizeof(PREFIX) + sizeof(binsubdir) + 20
-
-int main(int argc, char **argv) {
-	char path[PATHLEN], *p, *prog;
-
-	/* quickly find last part of path component */
-	if (p = strrchr(argv[0], '/'))
-		p++;
-	else
-		p = argv[0];
-	if (prog = strrchr(p, '-'))
-		prog++;
-	else
-		prog = p;
-
-	/* make program pathname */
-	snprintf(path, PATHLEN, "%s/%s/%s", PREFIX, binsubdir, prog);
-
-	/* set up environment */
-	setenv("GNUTARGET", GNUTARGET, 0);
-#ifdef LDEMULATION
-	setenv("LDEMULATION", LDEMULATION, 0);
-#endif
-#ifdef LD_RPATH_LINK
-	setenv("LD_RPATH_LINK", LD_RPATH_LINK, 1);
-#endif
-
-	/* run it! */
-	execv(path, argv);
-
-	/* we shouldn't get here. */
-	err(EX_OSERR, "(buwrapper): exec %s", path);
-}
--- a/cross/COMMON/cross.mk
+++ b/cross/COMMON/cross.mk
@@ -1,295 +0,0 @@
-#	$NetBSD: cross.mk,v 1.40 2009/06/14 22:57:58 joerg Exp $
-
-# Shared definitions for building a cross-compile environment.
-
-.include "../../mk/bsd.prefs.mk"
-
-DISTNAME=		cross-${TARGET_ARCH}-${DISTVERSION}
-CATEGORIES+=		cross lang
-USE_CROSSBASE=		yes
-PLIST_SRC=		${WRKDIR}/.PLIST_SRC
-
-HOMEPAGE?=		http://egcs.cygnus.com/
-
-TARGET_DIR=		${PREFIX}/${TARGET_ARCH}
-COMMON_DIR=		${PKGSRCDIR}/cross/COMMON
-PLIST_PRE?=		${PKGDIR}/PLIST
-MESSAGE_SUBST+=		CROSSBASE=${CROSSBASE}
-
-pre-install: pre-install-dirs
-pre-install-dirs:
-	${INSTALL_DATA_DIR} ${PREFIX}
-	${INSTALL_DATA_DIR} ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/lib
-	${INSTALL_DATA_DIR} ${TARGET_DIR}
-	${INSTALL_DATA_DIR} ${TARGET_DIR}/bin
-	${INSTALL_DATA_DIR} ${TARGET_DIR}/include
-	${INSTALL_DATA_DIR} ${TARGET_DIR}/lib
-
-.if defined(USE_CROSS_BINUTILS)
-BINUTILS_DISTNAME=	binutils-2.15
-BINUTILS_WRKSRC=	${WRKDIR}/${BINUTILS_DISTNAME}
-
-# Don't use optimizations taken from /etc/mk.conf for the native compiler
-CFLAGS=			# empty
-CXXFLAGS=		# empty
-
-CROSS_DISTFILES+=	${BINUTILS_DISTNAME}.tar.gz
-SITES.${BINUTILS_DISTNAME}.tar.gz+=		${MASTER_SITE_GNU:=binutils/}
-CONFIGURE_ARGS+=	--with-gnu-as --with-gnu-ld
-DEPENDS+=		cross-binutils>=2.15.0.0:../../cross/binutils
-PLIST_PRE+=		${COMMON_DIR}/PLIST-binutils
-
-AS_FOR_TARGET=		${BINUTILS_WRKSRC}/gas/as-new
-AR_FOR_TARGET=		${WRKDIR}/ar
-NM_FOR_TARGET=		${WRKDIR}/nm
-RANLIB_FOR_TARGET=	${WRKDIR}/ranlib
-LD_FOR_TARGET=		${WRKDIR}/ld
-USE_TOOLS+=		patch
-
-pre-patch: binutils-patch
-pre-configure: binutils-configure
-do-build: binutils-build
-do-install: binutils-install
-
-binutils-patch:
-	@for i in ${COMMON_DIR}/patches-binutils/patch-*; do \
-		${PATCH} -d ${BINUTILS_WRKSRC} --forward --quiet -E < $$i; \
-	done
-
-BFD64ARG=	--enable-64-bit-bfd
-
-binutils-configure:
-	@cd ${BINUTILS_WRKSRC} && ${SETENV} CC="${CC}" ac_cv_path_CC="${CC}" \
-		CFLAGS="${CFLAGS}" ${CONFIGURE_ENV} ./configure \
-		--prefix=${PREFIX} --host=${MACHINE_GNU_ARCH}--netbsd \
-		--target=${TARGET_ARCH} ${BFD64ARG}
-	cd ${BINUTILS_WRKSRC} && ${MAKE_PROGRAM} configure-bfd
-	cd ${BINUTILS_WRKSRC} && ${MAKE_PROGRAM} configure-libiberty
-	cd ${BINUTILS_WRKSRC} && ${MAKE_PROGRAM} configure-intl
-	cd ${BINUTILS_WRKSRC} && ${MAKE_PROGRAM} configure-gas
-
-binutils-build:
-	@cd ${BINUTILS_WRKSRC}/bfd && ${SETENV} ${MAKE_ENV} \
-		${MAKE_PROGRAM} ${MAKE_FLAGS} bfd.h
-	@cd ${BINUTILS_WRKSRC}/libiberty && ${SETENV} ${MAKE_ENV} \
-		${MAKE_PROGRAM} ${MAKE_FLAGS} all
-	@cd ${BINUTILS_WRKSRC}/intl && ${SETENV} ${MAKE_ENV} \
-		${MAKE_PROGRAM} ${MAKE_FLAGS} all
-	@cd ${BINUTILS_WRKSRC}/gas && ${SETENV} ${MAKE_ENV} \
-		${MAKE_PROGRAM} ${MAKE_FLAGS} as-new
-	${TEST} -x ${WRKDIR}/ar || ${LINK.c} -o ${WRKDIR}/ar \
-		-DPREFIX=\"${PREFIX}\" \
-		-DGNUTARGET=\"${BINUTILS_GNUTARGET}\" \
-		${COMMON_DIR}/buwrapper.c
-	@cd ${WRKDIR} && \
-		${LN} -f ar nm && \
-		${LN} -f ar ranlib
-	${TEST} -x ${WRKDIR}/ld || ${LINK.c} -o ${WRKDIR}/ld \
-		-DPREFIX=\"${PREFIX}\" \
-		-DGNUTARGET=\"${BINUTILS_GNUTARGET}\" \
-		-DLDEMULATION=\"${BINUTILS_LDEMULATION}\" \
-		-DLD_RPATH_LINK=\"${TARGET_DIR}/lib\" \
-		${COMMON_DIR}/buwrapper.c
-
-binutils-install:
-	${INSTALL_PROGRAM} ${BINUTILS_WRKSRC}/gas/as-new ${TARGET_DIR}/bin/as
-	${INSTALL_PROGRAM} ${WRKDIR}/ar ${TARGET_DIR}/bin/ar
-	${INSTALL_PROGRAM} ${WRKDIR}/ld ${TARGET_DIR}/bin/ld
-	for i in addr2line nm objcopy objdump ranlib size strings strip ${BINUTILS_EXTRAS}; do \
-		${LN} -f ${TARGET_DIR}/bin/ar ${TARGET_DIR}/bin/$$i; \
-	done
-	for i in addr2line ar as ld nm objcopy objdump ranlib size strings strip ${BINUTILS_EXTRAS}; do \
-		${LN} -f ${TARGET_DIR}/bin/$$i ${PREFIX}/bin/${TARGET_ARCH}-$$i; \
-	done
-.endif
-
-.if defined(USE_CROSS_EGCS)
-EGCS_DISTNAME=		egcs-1.1.1
-EGCS_DISTDIR=		releases/${EGCS_DISTNAME}
-EGCS_INTVERSION=	egcs-2.91.60
-EGCS_PATCHBUNDLE=	${EGCS_DISTNAME}-NetBSD-19980104.diff.gz
-EGCS_WRKSRC=		${WRKDIR}/${EGCS_DISTNAME}
-EGCS_LANGUAGES=		c # add to these below
-
-# only using autoheader; 2.13 and 2.54 both work fine
-USE_TOOLS+=		autoconf
-
-.if defined(EGCS_MULTILIB)
-EGCS_INSTALL_LIB=install-multilib
-.else
-EGCS_INSTALL_LIB=install-libgcc
-.endif
-
-.if defined(EGCS_NO_RUNTIME) || defined(EGCS_FAKE_RUNTIME)
-EGCS_NO_CXX_RUNTIME=	yes
-EGCS_NO_F77_RUNTIME=	yes
-EGCS_NO_OBJC_RUNTIME=	yes
-.endif
-
-.if !defined(EGCS_NO_CXX)
-CXX_CONFIGURE_ARGS+=	--with-gxx-include-dir=${TARGET_DIR}/include/g++
-EGCS_LANGUAGES+=	c++
-PLIST_PRE+=		${COMMON_DIR}/PLIST-egcs-cxx
-.if !defined(EGCS_NO_CXX_RUNTIME)
-PLIST_PRE+=		${COMMON_DIR}/PLIST-egcs-cxx-runtime
-.endif
-.endif
-
-.if !defined(EGCS_NO_F77)
-EGCS_LANGUAGES+=	f77
-PLIST_PRE+=		${COMMON_DIR}/PLIST-egcs-f77
-.if !defined(EGCS_NO_F77_RUNTIME)
-PLIST_PRE+=		${COMMON_DIR}/PLIST-egcs-f77-runtime
-.endif
-.endif
-
-.if !defined(EGCS_NO_OBJC)
-EGCS_LANGUAGES+=	objc
-PLIST_PRE+=		${COMMON_DIR}/PLIST-egcs-objc
-.if !defined(EGCS_NO_OBJC_RUNTIME)
-PLIST_PRE+=		${COMMON_DIR}/PLIST-egcs-objc-runtime
-.endif
-.endif
-
-# the main PLIST needs to go last to get the @dirrm's right
-PLIST_PRE+=		${COMMON_DIR}/PLIST-egcs
-CROSS_DISTFILES+=	${EGCS_DISTNAME}.tar.gz ${EGCS_PATCHBUNDLE}
-SITES.${EGCS_DISTNAME}.tar.gz=		# no known-good site; fall back to distfiles mirrors
-SITES.${EGCS_PATCHBUNDLE}=		${MASTER_SITE_LOCAL}
-USE_TOOLS+=		gmake pax
-
-CC_FOR_TARGET=		${EGCS_WRKSRC}/gcc/xgcc -B${EGCS_WRKSRC}/gcc/ ${CFLAGS_FOR_TARGET}
-CXX_FOR_TARGET=		${CC_FOR_TARGET}
-
-USE_TOOLS+=		chmod
-EGCS_MAKE_FLAGS=	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-			CC_FOR_TARGET="${CC_FOR_TARGET}" \
-			GCC_FOR_TARGET="${CC_FOR_TARGET}" \
-			CXX_FOR_TARGET="${CXX_FOR_TARGET}" \
-			AS_FOR_TARGET="${AS_FOR_TARGET}" \
-			AR_FOR_TARGET="${AR_FOR_TARGET}" \
-			NM_FOR_TARGET="${NM_FOR_TARGET}" \
-			RANLIB_FOR_TARGET="${RANLIB_FOR_TARGET}" \
-			LDFLAGS_FOR_TARGET="${LDFLAGS_FOR_TARGET}" \
-			LANGUAGES="${EGCS_LANGUAGES}" \
-			INSTALL="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}" \
-			INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-			ac_cv_path_ac_cv_prog_chmod="${TOOLS_CHMOD}"
-EGCS_MAKE=		${SETENV} ${MAKE_ENV} \
-	                ${MAKE_PROGRAM} ${MAKE_FLAGS} ${EGCS_MAKE_FLAGS}
-
-.if defined(EGCS_FAKE_RUNTIME)
-CROSS_SYS_INCLUDE=		${WRKDIR}/include
-.endif
-.if defined(CROSS_SYS_INCLUDE)
-CFLAGS_FOR_TARGET+=	-idirafter ${CROSS_SYS_INCLUDE}
-EGCS_MAKE_FLAGS+=	SYSTEM_HEADER_DIR="${CROSS_SYS_INCLUDE}"
-.endif
-.if defined(SYS_LIB)
-LDFLAGS_FOR_TARGET+=	-L${SYS_LIB}
-.endif
-
-pre-patch: egcs-patch
-pre-configure: egcs-configure
-do-build: egcs-build
-do-install: egcs-install
-
-egcs-patch:
-	@${GZCAT} ${_DISTDIR}/${EGCS_PATCHBUNDLE} | \
-		${PATCH} -d ${EGCS_WRKSRC} --forward --quiet -E
-	@for i in ${COMMON_DIR}/patches-egcs/patch-*; do \
-		${PATCH} -d ${EGCS_WRKSRC} --forward --quiet -E < $$i; \
-	done
-
-egcs-configure:
-	@cd ${EGCS_WRKSRC} && ${SETENV} CC="${CC}" ac_cv_path_CC="${CC}" \
-		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
-		INSTALL="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}" \
-		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		./configure --prefix=${PREFIX} \
-		--host=${MACHINE_GNU_ARCH}--netbsd  --target=${TARGET_ARCH} \
-		${CXX_CONFIGURE_ARGS}
-.if defined(EGCS_FAKE_RUNTIME)
-	@${MKDIR} ${CROSS_SYS_INCLUDE} ${CROSS_SYS_INCLUDE}/machine \
-		${CROSS_SYS_INCLUDE}/sys
-	@cd ${CROSS_SYS_INCLUDE} && ${TOUCH} ${TOUCH_FLAGS} machine/ansi.h \
-		sys/time.h stdlib.h unistd.h
-.endif
-
-egcs-build:
-	@${LN} -sf ${AS_FOR_TARGET} ${EGCS_WRKSRC}/gcc/as
-	@${LN} -sf ${LD_FOR_TARGET} ${EGCS_WRKSRC}/gcc/ld
-	@cd ${EGCS_WRKSRC}/gcc && ${EGCS_MAKE} all
-.if !defined(EGCS_NO_CXX) && !defined(EGCS_NO_CXX_RUNTIME)
-	@cd ${EGCS_WRKSRC} && ${EGCS_MAKE} configure-target-libio configure-target-libstdc++ all-target-libio all-target-libstdc++
-.endif
-.if !defined(EGCS_NO_F77) && !defined(EGCS_NO_F77_RUNTIME)
-	@cd ${EGCS_WRKSRC} && ${EGCS_MAKE} configure-target-libf2c all-target-libf2c
-.endif
-.if !defined(EGCS_NO_OBJC) && !defined(EGCS_NO_OBJC_RUNTIME)
-	@cd ${EGCS_WRKSRC}/gcc && ${EGCS_MAKE} objc-runtime
-.endif
-
-egcs-install:
-	@cd ${EGCS_WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} \
-		${MAKE_PROGRAM} ${MAKE_FLAGS} ${EGCS_MAKE_FLAGS} \
-		install-common install-headers ${EGCS_INSTALL_LIB} install-driver
-	${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}
-	${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-gcc ${PREFIX}/bin/${TARGET_ARCH}-cc
-	${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-gcc ${TARGET_DIR}/bin/cc
-.if !defined(EGCS_NO_F77)
-.if !defined(EGCS_NO_F77_RUNTIME)
-	@cd ${EGCS_WRKSRC} && ${EGCS_MAKE} install-target-libf2c
-.endif
-	${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-g77 ${PREFIX}/bin/${TARGET_ARCH}-f77
-	${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-g77 ${PREFIX}/bin/${TARGET_ARCH}-fort77
-	for file in f77 fort77 g77; do \
-		${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-$$file ${TARGET_DIR}/bin/$$file; \
-	done
-.endif
-.if !defined(EGCS_NO_CXX)
-.if !defined(EGCS_NO_CXX_RUNTIME)
-	@${MKDIR} ${TARGET_DIR}/include/g++/std
-	@cd ${EGCS_WRKSRC} && ${EGCS_MAKE} install-target-libstdc++
-.endif
-	for file in c++ c++filt g++; do \
-		${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-$$file ${TARGET_DIR}/bin/$$file; \
-	done
-.endif
-	@${RMDIR} -p ${PREFIX}/info 2>/dev/null || ${TRUE}
-	@${RMDIR} -p ${PREFIX}/man/man1 2>/dev/null || ${TRUE}
-.endif
-
-.if defined(CROSS_DISTFILES)
-DISTFILES+=		${CROSS_DISTFILES}
-.if defined(EXTRACT_ONLY)
-EXTRACT_ONLY+=		${CROSS_DISTFILES:N*.diff.gz}
-.else
-EXTRACT_ONLY=		${DISTFILES:N*.diff.gz}
-.endif
-.endif
-
-.if defined(CROSS_SYS_INCLUDE) && !defined(EGCS_FAKE_RUNTIME)
-pre-install: pre-install-includes
-pre-install-includes:
-	cd ${CROSS_SYS_INCLUDE} && pax -rw . ${TARGET_DIR}/include
-.endif
-
-.if defined(SYS_LIB)
-pre-install: pre-install-lib
-pre-install-lib:
-	cd ${SYS_LIB} && pax -rw . ${TARGET_DIR}/lib
-.endif
-
-post-install: post-install-plist
-post-install-plist:
-	@${SED} -e 's|$${TARGET_ARCH}|${TARGET_ARCH}|' \
-		-e 's|$${EGCS_INTVERSION}|${EGCS_INTVERSION}|' \
-		${PLIST_PRE} >${PLIST_SRC}
-	@${ECHO} '@pkgdir ${TARGET_ARCH}/include' >>${PLIST_SRC}
-	@${ECHO} '@pkgdir ${TARGET_ARCH}/lib' >>${PLIST_SRC}
-
-.include "../../mk/bsd.pkg.mk"
-
-EXTRACT_BEFORE_ARGS:=	-X ${COMMON_DIR}/exclude ${EXTRACT_BEFORE_ARGS}
--- a/cross/COMMON/exclude
+++ b/cross/COMMON/exclude
@@ -1,11 +0,0 @@
-egcs-*/*/tests/*
-egcs-*/*/testsuite/*
-egcs-*/gcc/*/tests/*
-egcs-*/gcc/*/testsuite/*
-egcs-*/texinfo/*
-binutils-*/*/tests/*
-binutils-*/*/testsuite/*
-binutils-*/binutils/*
-binutils-*/etc/*
-binutils-*/gprof/*
-binutils-*/ld/*
--- a/cross/COMMON/netbsd.mk
+++ b/cross/COMMON/netbsd.mk
@@ -1,15 +0,0 @@
-#	$NetBSD: netbsd.mk,v 1.2 1998/08/12 18:58:09 tv Exp $
-
-# Definitions for building a cross-compile environment for a NetBSD target.
-
-# If the MACHINE_ARCH matches the package target, we can use a special
-# "shortcut" hack that makes use of the native compiler with a bundle of
-# includes and libraries for the target version of NetBSD.  Otherwise, or
-# if USE_EGCS_FOR_NATIVE is set in mk.conf, we use the standard egcs+binutils
-# cross setup.  (For now, we just use egcs.)
-
-#.include "../../mk/bsd.prefs.mk"
-#.if defined(USE_EGCS_FOR_NATIVE) || (${MACHINE_ARCH} != ${TARGET_ARCH})
-.include "../COMMON/cross.mk"
-#.else
-#.endif
--- a/cross/COMMON/patches-binutils/patch-aa
+++ b/cross/COMMON/patches-binutils/patch-aa
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/07/09 20:48:15 kristerw Exp $
-
--- gas/Makefile.in.orig	Sat Jul  3 02:57:14 2004
-+++ gas/Makefile.in	Sat Jul  3 03:00:33 2004
-@@ -710,7 +710,7 @@
- 
- # How to link with both our special library facilities
- # and the system's installed libraries.
-GASLIBS = @OPCODES_LIB@ @BFDLIB@ ../libiberty/libiberty.a
-+GASLIBS = ${PREFIX}/lib/libbfd.a ${PREFIX}/lib/libiberty.a
- 
- # Files to be copied away after each stage in building.
- STAGESTUFF = *.o $(noinst_PROGRAMS)
--- a/cross/COMMON/patches-egcs/patch-aa
+++ b/cross/COMMON/patches-egcs/patch-aa
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.1 1999/01/04 22:37:30 tv Exp $
-
--- Makefile.in.orig	Sat Jun 27 18:08:28 1998
-+++ Makefile.in	Thu Aug 13 17:32:08 1998
-@@ -349,6 +349,7 @@
- 	"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
- 	"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
- 	"SHELL=$(SHELL)" \
-+	"SYSTEM_HEADER_DIR=$(SYSTEM_HEADER_DIR)" \
- 	"EXPECT=$(EXPECT)" \
- 	"RUNTEST=$(RUNTEST)" \
- 	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
-@@ -356,6 +357,7 @@
- 	"WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \
- 	"YACC=$(YACC)" \
- 	"exec_prefix=$(exec_prefix)" \
-+	"enable_version_specific_runtime_libs=$(enable_version_specific_runtime_libs)" \
- 	"prefix=$(prefix)" \
- 	"tooldir=$(tooldir)" \
- 	"gxx_include_dir=$(gxx_include_dir)" \
-@@ -405,6 +407,7 @@
- 	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
- 	'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
- 	'LD=$$(LD_FOR_TARGET)' \
-+	'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
- 	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
- 	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
- 	'NM=$$(NM_FOR_TARGET)' \
--- a/cross/COMMON/patches-egcs/patch-ab
+++ b/cross/COMMON/patches-egcs/patch-ab
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1999/01/06 01:14:21 tv Exp $
-
--- gcc/objc/Make-lang.in.orig	Tue Jan  5 19:01:14 1999
-+++ gcc/objc/Make-lang.in	Tue Jan  5 19:01:28 1999
-@@ -50,8 +50,8 @@
- 
- #
- # Define the names for selecting Objective-C in LANGUAGES.
-OBJC objc: cc1obj$(exeext) objc-runtime
-OBJECTIVE-C objective-c: cc1obj$(exeext) objc-runtime
-+OBJC objc: cc1obj$(exeext)
-+OBJECTIVE-C objective-c: cc1obj$(exeext)
- 
- # Tell GNU make to ignore these if they exist.
- .PHONY: objective-c objc ObjC
--- a/cross/COMMON/patches-egcs/patch-ac
+++ b/cross/COMMON/patches-egcs/patch-ac
@@ -1,39 +0,0 @@
--- libiberty/strerror.c.orig	Fri May 15 19:42:41 1998
-+++ libiberty/strerror.c	Wed Jan  6 12:10:40 1999
-@@ -7,21 +7,12 @@
- 
- #include "config.h"
- 
-#ifdef HAVE_SYS_ERRLIST
-/* Note that errno.h (not sure what OS) or stdio.h (BSD 4.4, at least)
-   might declare sys_errlist in a way that the compiler might consider
-   incompatible with our later declaration, perhaps by using const
-   attributes.  So we hide the declaration in errno.h (if any) using a
-   macro. */
-#define sys_errlist sys_errlist__
-#endif
-
- #include <stdio.h>
- #include <errno.h>
- 
-#ifdef HAVE_SYS_ERRLIST
-#undef sys_errlist
-#endif
-+/* Bogus!  We have these. */
-+#undef HAVE_SYS_ERRLIST
-+#define HAVE_SYS_ERRLIST
- 
- /*  Routines imported from standard C runtime libraries. */
- 
-@@ -459,11 +450,6 @@
- 
- static int sys_nerr;
- static const char **sys_errlist;
-
-#else
-
-extern int sys_nerr;
-extern char *sys_errlist[];
- 
- #endif
- 
--- a/cross/COMMON/patches-egcs/patch-ad
+++ b/cross/COMMON/patches-egcs/patch-ad
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/01/05 19:31:13 joerg Exp $
-
--- gcc/config/sparc/netbsdelf.h.orig	2005-12-23 17:30:11.000000000 +0000
-+++ gcc/config/sparc/netbsdelf.h
-@@ -12,6 +12,12 @@
- #undef CPP_SUBTARGET_SPEC
- #define CPP_SUBTARGET_SPEC ""
- 
-+#undef MULDI3_LIBCALL
-+#undef DIVDI3_LIBCALL
-+#undef UDIVDI3_LIBCALL
-+#undef MODDI3_LIBCALL
-+#undef UMODDI3_LIBCALL
-+
- #define NETBSD_ELF
- #include <netbsd.h>
- 
--- a/cross/COMMON/patches-egcs/patch-ae
+++ b/cross/COMMON/patches-egcs/patch-ae
@@ -1,26 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1999/02/14 10:12:03 mrg Exp $
-
-Index: gcc/configure.in
-===================================================================
-RCS file: /cvsroot/src/gnu/dist/gcc/configure.in,v
-retrieving revision 1.10
-retrieving revision 1.11
-diff -c -r1.10 -r1.11
-*** gcc/configure.in	1998/12/16 14:49:45	1.10
--- gcc/configure.in	1999/01/28 22:01:28	1.11
-***************
-*** 862,867 ****
--- 862,874 ----
-  		fixincludes=fixinc.wrap
-  		tmake_file=i386/t-freebsd
-  		;;
-+ 	i[[34567]]86-*-netbsdelf*)
-+ 		tm_file=i386/netbsd-elf.h
-+ 		xm_file=i386/xm-netbsd.h
-+ 		# On NetBSD, the headers are already okay, except for math.h.
-+ 		fixincludes=fixinc.wrap
-+ 		tmake_file=t-netbsd
-+ 		;;
-  	i[[34567]]86-*-netbsd*)
-  		tm_file=i386/netbsd.h
-  		xm_file=i386/xm-netbsd.h
--- a/cross/COMMON/patches-egcs/patch-af
+++ b/cross/COMMON/patches-egcs/patch-af
@@ -1,44 +0,0 @@
-$NetBSD: patch-af,v 1.2 2000/02/19 00:53:40 tsutsui Exp $
-
--- gcc/configure.orig	Thu Feb 17 01:07:22 2000
-+++ gcc/configure	Fri Feb 18 19:19:50 2000
-@@ -2764,6 +2764,13 @@
- 		fixincludes=fixinc.wrap
- 		tmake_file=i386/t-freebsd
- 		;;
-+	i[34567]86-*-netbsdelf*)
-+		tm_file=i386/netbsd-elf.h
-+		xm_file=i386/xm-netbsd.h
-+		# On NetBSD, the headers are already okay, except for math.h.
-+		fixincludes=fixinc.wrap
-+		tmake_file=t-netbsd
-+		;;
- 	i[34567]86-*-netbsd*)
- 		tm_file=i386/netbsd.h
- 		xm_file=i386/xm-netbsd.h
-@@ -3857,7 +3864,16 @@
- 		xm_file=mips/xm-netbsd.h
- 		# On NetBSD, the headers are already okay, except for math.h.
- 		fixincludes=fixinc.wrap
-		tmake_file=t-netbsd
-+		tmake_file="t-netbsd mips/t-mipsel"
-+		xmake_file=none
-+		;;
-+	mipseb-*-netbsd*)
-+		tm_file=mips/netbsd.h
-+		xm_file=mips/xm-netbsd.h
-+		# On NetBSD, the headers are already okay, except for math.h.
-+		fixincludes=fixinc.wrap
-+		tmake_file="t-netbsd mips/t-mipseb"
-+		xmake_file=none
- 		;;
- 	mips-sony-bsd* | mips-sony-newsos*)	# Sony NEWS 3600 or risc/news.
- 		tm_file="mips/news4.h ${tm_file}"
-@@ -4233,6 +4249,7 @@
- 		# On NetBSD, the headers are already okay, except for math.h.
- 		fixincludes=fixinc.wrap
- 		tmake_file=t-netbsd
-+		xmake_file=none
- 		;;
- 	powerpc-*-eabiaix*)
- 		tm_file=rs6000/eabiaix.h
--- a/cross/COMMON/patches-egcs/patch-ag
+++ b/cross/COMMON/patches-egcs/patch-ag
@@ -1,605 +0,0 @@
-$NetBSD: patch-ag,v 1.1 1999/02/14 10:12:03 mrg Exp $
-
-Index: gcc/config/i386/netbsd-elf.h
-*** /dev/null	Sun Feb 14 16:47:33 1999
--- gcc/config/i386/netbsd-elf.h	Sun Feb 14 19:03:37 1999
-***************
-*** 0 ****
--- 1,597 ----
-+ /* Definitions of target machine for GNU compiler,
-+    for i386 NetBSD systems.
-+    Copyright (C) 1998 Free Software Foundation, Inc.
-+ 
-+ This file is part of GNU CC.
-+ 
-+ GNU CC is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2, or (at your option)
-+ any later version.
-+ 
-+ GNU CC is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ GNU General Public License for more details.
-+ 
-+ You should have received a copy of the GNU General Public License
-+ along with GNU CC; see the file COPYING.  If not, write to
-+ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-+ 
-+ /* This is used on i386 platforms that use the ELF format.
-+    This was taken from the NetBSD/alpha configuration, and modified
-+    for NetBSD/i386 by Christos Zoulas <christos@netbsd.org> */
-+ 
-+ /* Get generic i386 definitions. */
-+ 
-+ /* This goes away when the math-emulator is fixed */
-+ #define TARGET_CPU_DEFAULT 0400		/* TARGET_NO_FANCY_MATH_387 */
-+ 
-+ #include <i386/gstabs.h>
-+ 
-+ /* Get perform_* macros to build libgcc.a.  */
-+ #include <i386/perform.h>
-+ 
-+ /* Get generic NetBSD ELF definitions.  We will override these if necessary. */
-+ 
-+ #define NETBSD_ELF
-+ #include <netbsd.h>
-+ 
-+ #define OBJECT_FORMAT_ELF
-+ 
-+ /* This is BSD, so it wants DBX format. */
-+ 
-+ #if 0
-+ #define DBX_DEBUGGING_INFO
-+ 
-+ /* This is the char to use for continuation (in case we need to turn
-+    continuation back on). */
-+ 
-+ #define DBX_CONTIN_CHAR '?'
-+ #endif
-+ 
-+ #undef ASM_FINAL_SPEC
-+ 
-+ /* Names to predefine in the preprocessor for this target machine.
-+    XXX NetBSD, by convention, shouldn't do __alpha, but lots of applications
-+    expect it because that's what OSF/1 does. */
-+ 
-+ /* NetBSD Extension to GNU C: __KPRINTF_ATTRIBUTE__ */
-+ 
-+ #undef CPP_PREDEFINES
-+ #define CPP_PREDEFINES "\
-+ -Di386 -D__NetBSD__ -D__ELF__ -D__KPRINTF_ATTRIBUTE__ \
-+ -Asystem(unix) -Asystem(NetBSD) -Acpu(i386) -Amachine(i386)"
-+ 
-+ /* Make gcc agree with <machine/ansi.h> */
-+ 
-+ #undef SIZE_TYPE
-+ #define SIZE_TYPE "unsigned int"
-+ 
-+ #undef PTRDIFF_TYPE
-+ #define PTRDIFF_TYPE "int"
-+ 
-+ #undef WCHAR_TYPE
-+ #define WCHAR_TYPE "int"
-+ 
-+ #undef WCHAR_UNSIGNED
-+ #define WCHAR_UNSIGNED 0
-+ 
-+ #undef WCHAR_TYPE_SIZE
-+ #define WCHAR_TYPE_SIZE 32
-+ 
-+ /* Output assembler code to FILE to increment profiler label # LABELNO
-+    for profiling a function entry.  Under NetBSD/i386, the assembler does
-+    nothing special with -pg. */
-+ 
-+ #undef ASM_APP_ON
-+ #define ASM_APP_ON "#APP\n"
-+ 
-+ #undef ASM_APP_OFF
-+ #define ASM_APP_OFF "#NO_APP\n"
-+ 
-+ #define bsd4_4
-+ #undef HAS_INIT_SECTION
-+ 
-+ #undef ASM_FILE_START
-+ #define ASM_FILE_START(FILE)					\
-+ {								\
-+   output_file_directive (FILE, main_input_filename);		\
-+   fprintf (FILE, "\t.version\t\"01.01\"\n");			\
-+ }
-+ 
-+ /* Provide a LINK_SPEC appropriate for a NetBSD/alpha ELF target.  Only
-+    the linker emulation is i386-specific.  The rest are
-+    common to all ELF targets, except for the name of the start function. */
-+ 
-+ #undef LINK_SPEC
-+ #define LINK_SPEC \
-+  "-m elf_i386 \
-+   %{assert*} %{R*} \
-+   %{shared:-shared} \
-+   %{!shared: \
-+     -dc -dp \
-+     %{!nostdlib:%{!r*:%{!e*:-e __start}}} \
-+     %{!static: \
-+       %{rdynamic:-export-dynamic} \
-+       %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.elf_so}} \
-+     %{static:-static}}"
-+ 
-+ #undef DEFAULT_VTABLE_THUNKS
-+ #define DEFAULT_VTABLE_THUNKS 1
-+ 
-+ /* Attach a special .ident directive to the end of the file to identify
-+    the version of GCC which compiled this code.  The format of the
-+    .ident string is patterned after the ones produced by native svr4
-+    C compilers.  */
-+ 
-+ /* Output #ident as a .ident.  */
-+ 
-+ /* This is how to allocate empty space in some section.  The .zero
-+    pseudo-op is used for this on most svr4 assemblers.  */
-+ #undef SKIP_ASM_OP
-+ #define SKIP_ASM_OP	"\t.zero"
-+ 
-+ #undef ASM_OUTPUT_SKIP
-+ #define ASM_OUTPUT_SKIP(FILE,SIZE) \
-+   fprintf (FILE, "\t%s\t%u\n", SKIP_ASM_OP, (SIZE))
-+ 
-+ /* Output the label which precedes a jumptable.  Note that for all svr4
-+    systems where we actually generate jumptables (which is to say every
-+    svr4 target except i386, where we use casesi instead) we put the jump-
-+    tables into the .rodata section and since other stuff could have been
-+    put into the .rodata section prior to any given jumptable, we have to
-+    make sure that the location counter for the .rodata section gets pro-
-+    perly re-aligned prior to the actual beginning of the jump table.  */
-+ 
-+ #define ALIGN_ASM_OP ".align"
-+ 
-+ #ifndef ASM_OUTPUT_BEFORE_CASE_LABEL
-+ #define ASM_OUTPUT_BEFORE_CASE_LABEL(FILE,PREFIX,NUM,TABLE) \
-+   ASM_OUTPUT_ALIGN ((FILE), 2);
-+ #endif
-+ 
-+ #undef ASM_OUTPUT_CASE_LABEL
-+ #define ASM_OUTPUT_CASE_LABEL(FILE,PREFIX,NUM,JUMPTABLE)		\
-+   do {									\
-+     ASM_OUTPUT_BEFORE_CASE_LABEL (FILE, PREFIX, NUM, JUMPTABLE)		\
-+     ASM_OUTPUT_INTERNAL_LABEL (FILE, PREFIX, NUM);			\
-+   } while (0)
-+ 
-+ /* The standard SVR4 assembler seems to require that certain builtin
-+    library routines (e.g. .udiv) be explicitly declared as .globl
-+    in each assembly file where they are referenced.  */
-+ 
-+ #define ASM_OUTPUT_EXTERNAL_LIBCALL(FILE, FUN)				\
-+   ASM_GLOBALIZE_LABEL (FILE, XSTR (FUN, 0))
-+ 
-+ /* This says how to output assembler code to declare an
-+    uninitialized external linkage data object.  Under SVR4,
-+    the linker seems to want the alignment of data objects
-+    to depend on their types.  We do exactly that here.  */
-+ 
-+ #define COMMON_ASM_OP	".comm"
-+ 
-+ #undef ASM_OUTPUT_ALIGN
-+ #define ASM_OUTPUT_ALIGN(FILE,LOG) \
-+   if ((LOG)!=0) fprintf ((FILE), "\t.align %d\n", 1 << (LOG))
-+ 
-+ #undef ASM_OUTPUT_ALIGNED_COMMON
-+ #define ASM_OUTPUT_ALIGNED_COMMON(FILE, NAME, SIZE, ALIGN)		\
-+ do {									\
-+   fprintf ((FILE), "\t%s\t", COMMON_ASM_OP);				\
-+   assemble_name ((FILE), (NAME));					\
-+   fprintf ((FILE), ",%u,%u\n", (SIZE), (ALIGN) / BITS_PER_UNIT);	\
-+ } while (0)
-+ 
-+ /* This says how to output assembler code to declare an
-+    uninitialized internal linkage data object.  Under SVR4,
-+    the linker seems to want the alignment of data objects
-+    to depend on their types.  We do exactly that here.  */
-+ 
-+ #define LOCAL_ASM_OP	".local"
-+ 
-+ #undef ASM_OUTPUT_ALIGNED_LOCAL
-+ #define ASM_OUTPUT_ALIGNED_LOCAL(FILE, NAME, SIZE, ALIGN)		\
-+ do {									\
-+   fprintf ((FILE), "\t%s\t", LOCAL_ASM_OP);				\
-+   assemble_name ((FILE), (NAME));					\
-+   fprintf ((FILE), "\n");						\
-+   ASM_OUTPUT_ALIGNED_COMMON (FILE, NAME, SIZE, ALIGN);			\
-+ } while (0)
-+ 
-+ /* This is the pseudo-op used to generate a 32-bit word of data with a
-+    specific value in some section.  */
-+ 
-+ #define INT_ASM_OP		".long"
-+ 
-+ /* This is the pseudo-op used to generate a contiguous sequence of byte
-+    values from a double-quoted string WITHOUT HAVING A TERMINATING NUL
-+    AUTOMATICALLY APPENDED.  This is the same for most svr4 assemblers.  */
-+ 
-+ #undef ASCII_DATA_ASM_OP
-+ #define ASCII_DATA_ASM_OP	".ascii"
-+ 
-+ /* Support const sections and the ctors and dtors sections for g++.
-+    Note that there appears to be two different ways to support const
-+    sections at the moment.  You can either #define the symbol
-+    READONLY_DATA_SECTION (giving it some code which switches to the
-+    readonly data section) or else you can #define the symbols
-+    EXTRA_SECTIONS, EXTRA_SECTION_FUNCTIONS, SELECT_SECTION, and
-+    SELECT_RTX_SECTION.  We do both here just to be on the safe side.  */
-+ 
-+ #define USE_CONST_SECTION	1
-+ 
-+ #define CONST_SECTION_ASM_OP	".section\t.rodata"
-+ 
-+ /* Define the pseudo-ops used to switch to the .ctors and .dtors sections.
-+ 
-+    Note that we want to give these sections the SHF_WRITE attribute
-+    because these sections will actually contain data (i.e. tables of
-+    addresses of functions in the current root executable or shared library
-+    file) and, in the case of a shared library, the relocatable addresses
-+    will have to be properly resolved/relocated (and then written into) by
-+    the dynamic linker when it actually attaches the given shared library
-+    to the executing process.  (Note that on SVR4, you may wish to use the
-+    `-z text' option to the ELF linker, when building a shared library, as
-+    an additional check that you are doing everything right.  But if you do
-+    use the `-z text' option when building a shared library, you will get
-+    errors unless the .ctors and .dtors sections are marked as writable
-+    via the SHF_WRITE attribute.)  */
-+ 
-+ #define CTORS_SECTION_ASM_OP	".section\t.ctors,\"aw\""
-+ #define DTORS_SECTION_ASM_OP	".section\t.dtors,\"aw\""
-+ 
-+ /* On svr4, we *do* have support for the .init and .fini sections, and we
-+    can put stuff in there to be executed before and after `main'.  We let
-+    crtstuff.c and other files know this by defining the following symbols.
-+    The definitions say how to change sections to the .init and .fini
-+    sections.  This is the same for all known svr4 assemblers.  */
-+ 
-+ #define INIT_SECTION_ASM_OP	".section\t.init"
-+ #define FINI_SECTION_ASM_OP	".section\t.fini"
-+ 
-+ /* A default list of other sections which we might be "in" at any given
-+    time.  For targets that use additional sections (e.g. .tdesc) you
-+    should override this definition in the target-specific file which
-+    includes this file.  */
-+ 
-+ #undef EXTRA_SECTIONS
-+ #define EXTRA_SECTIONS in_const, in_ctors, in_dtors
-+ 
-+ /* A default list of extra section function definitions.  For targets
-+    that use additional sections (e.g. .tdesc) you should override this
-+    definition in the target-specific file which includes this file.  */
-+ 
-+ #undef EXTRA_SECTION_FUNCTIONS
-+ #define EXTRA_SECTION_FUNCTIONS						\
-+   CONST_SECTION_FUNCTION						\
-+   CTORS_SECTION_FUNCTION						\
-+   DTORS_SECTION_FUNCTION
-+ 
-+ #undef READONLY_DATA_SECTION
-+ #define READONLY_DATA_SECTION() const_section ()
-+ 
-+ extern void text_section ();
-+ 
-+ #define CONST_SECTION_FUNCTION						\
-+ void									\
-+ const_section ()							\
-+ {									\
-+   if (!USE_CONST_SECTION)						\
-+     text_section();							\
-+   else if (in_section != in_const)					\
-+     {									\
-+       fprintf (asm_out_file, "%s\n", CONST_SECTION_ASM_OP);		\
-+       in_section = in_const;						\
-+     }									\
-+ }
-+ 
-+ #define CTORS_SECTION_FUNCTION						\
-+ void									\
-+ ctors_section ()							\
-+ {									\
-+   if (in_section != in_ctors)						\
-+     {									\
-+       fprintf (asm_out_file, "%s\n", CTORS_SECTION_ASM_OP);		\
-+       in_section = in_ctors;						\
-+     }									\
-+ }
-+ 
-+ #define DTORS_SECTION_FUNCTION						\
-+ void									\
-+ dtors_section ()							\
-+ {									\
-+   if (in_section != in_dtors)						\
-+     {									\
-+       fprintf (asm_out_file, "%s\n", DTORS_SECTION_ASM_OP);		\
-+       in_section = in_dtors;						\
-+     }									\
-+ }
-+ 
-+ /* Switch into a generic section.
-+    This is currently only used to support section attributes.
-+ 
-+    We make the section read-only and executable for a function decl,
-+    read-only for a const data decl, and writable for a non-const data decl.  */
-+ #define ASM_OUTPUT_SECTION_NAME(FILE, DECL, NAME, RELOC) \
-+   fprintf (FILE, ".section\t%s,\"%s\",@progbits\n", NAME, \
-+ 	   (DECL) && TREE_CODE (DECL) == FUNCTION_DECL ? "ax" : \
-+ 	   (DECL) && DECL_READONLY_SECTION (DECL, RELOC) ? "a" : "aw")
-+ 
-+ 
-+ /* A C statement (sans semicolon) to output an element in the table of
-+    global constructors.  */
-+ #define ASM_OUTPUT_CONSTRUCTOR(FILE,NAME)				\
-+   do {									\
-+     ctors_section ();							\
-+     fprintf (FILE, "\t%s\t ", INT_ASM_OP);				\
-+     assemble_name (FILE, NAME);						\
-+     fprintf (FILE, "\n");						\
-+   } while (0)
-+ 
-+ /* A C statement (sans semicolon) to output an element in the table of
-+    global destructors.  */
-+ #define ASM_OUTPUT_DESTRUCTOR(FILE,NAME)       				\
-+   do {									\
-+     dtors_section ();                   				\
-+     fprintf (FILE, "\t%s\t ", INT_ASM_OP);				\
-+     assemble_name (FILE, NAME);              				\
-+     fprintf (FILE, "\n");						\
-+   } while (0)
-+ 
-+ /* A C statement or statements to switch to the appropriate
-+    section for output of DECL.  DECL is either a `VAR_DECL' node
-+    or a constant of some sort.  RELOC indicates whether forming
-+    the initial value of DECL requires link-time relocations.  */
-+ 
-+ #define SELECT_SECTION(DECL,RELOC)					\
-+ {									\
-+   if (TREE_CODE (DECL) == STRING_CST)					\
-+     {									\
-+       if (! flag_writable_strings)					\
-+ 	const_section ();						\
-+       else								\
-+ 	data_section ();						\
-+     }									\
-+   else if (TREE_CODE (DECL) == VAR_DECL)				\
-+     {									\
-+       if ((flag_pic && RELOC)						\
-+ 	  || !TREE_READONLY (DECL) || TREE_SIDE_EFFECTS (DECL)		\
-+ 	  || !DECL_INITIAL (DECL)					\
-+ 	  || (DECL_INITIAL (DECL) != error_mark_node			\
-+ 	      && !TREE_CONSTANT (DECL_INITIAL (DECL))))			\
-+ 	data_section ();						\
-+       else								\
-+ 	const_section ();						\
-+     }									\
-+   else									\
-+     const_section ();							\
-+ }
-+ 
-+ /* A C statement or statements to switch to the appropriate
-+    section for output of RTX in mode MODE.  RTX is some kind
-+    of constant in RTL.  The argument MODE is redundant except
-+    in the case of a `const_int' rtx.  Currently, these always
-+    go into the const section.  */
-+ 
-+ #undef SELECT_RTX_SECTION
-+ #define SELECT_RTX_SECTION(MODE,RTX) const_section()
-+ 
-+ /* Define the strings used for the special svr4 .type and .size directives.
-+    These strings generally do not vary from one system running svr4 to
-+    another, but if a given system (e.g. m88k running svr) needs to use
-+    different pseudo-op names for these, they may be overridden in the
-+    file which includes this one.  */
-+ 
-+ #define TYPE_ASM_OP	".type"
-+ #define SIZE_ASM_OP	".size"
-+ 
-+ /* The following macro defines the format used to output the second
-+    operand of the .type assembler directive.  Different svr4 assemblers
-+    expect various different forms for this operand.  The one given here
-+    is just a default.  You may need to override it in your machine-
-+    specific tm.h file (depending upon the particulars of your assembler).  */
-+ 
-+ #define TYPE_OPERAND_FMT	"@%s"
-+ 
-+ /* Write the extra assembler code needed to declare a function's result.
-+    Most svr4 assemblers don't require any special declaration of the
-+    result value, but there are exceptions.  */
-+ 
-+ #ifndef ASM_DECLARE_RESULT
-+ #define ASM_DECLARE_RESULT(FILE, RESULT)
-+ #endif
-+ 
-+ /* These macros generate the special .type and .size directives which
-+    are used to set the corresponding fields of the linker symbol table
-+    entries in an ELF object file under SVR4.  These macros also output
-+    the starting labels for the relevant functions/objects.  */
-+ 
-+ /* Write the extra assembler code needed to declare a function properly.
-+    Some svr4 assemblers need to also have something extra said about the
-+    function's return value.  We allow for that here.  */
-+ 
-+ #define ASM_DECLARE_FUNCTION_NAME(FILE, NAME, DECL)			\
-+   do {									\
-+     fprintf (FILE, "\t%s\t ", TYPE_ASM_OP);				\
-+     assemble_name (FILE, NAME);						\
-+     putc (',', FILE);							\
-+     fprintf (FILE, TYPE_OPERAND_FMT, "function");			\
-+     putc ('\n', FILE);							\
-+     ASM_DECLARE_RESULT (FILE, DECL_RESULT (DECL));			\
-+     ASM_OUTPUT_LABEL(FILE, NAME);					\
-+   } while (0)
-+ 
-+ /* Write the extra assembler code needed to declare an object properly.  */
-+ 
-+ #define ASM_DECLARE_OBJECT_NAME(FILE, NAME, DECL)			\
-+   do {									\
-+     fprintf (FILE, "\t%s\t ", TYPE_ASM_OP);				\
-+     assemble_name (FILE, NAME);						\
-+     putc (',', FILE);							\
-+     fprintf (FILE, TYPE_OPERAND_FMT, "object");				\
-+     putc ('\n', FILE);							\
-+     size_directive_output = 0;						\
-+     if (!flag_inhibit_size_directive && DECL_SIZE (DECL))		\
-+       {									\
-+ 	size_directive_output = 1;					\
-+ 	fprintf (FILE, "\t%s\t ", SIZE_ASM_OP);				\
-+ 	assemble_name (FILE, NAME);					\
-+ 	putc (',', FILE);						\
-+ 	fprintf (FILE, HOST_WIDE_INT_PRINT_DEC,				\
-+ 		 int_size_in_bytes (TREE_TYPE (DECL)));			\
-+ 	fputc ('\n', FILE);						\
-+       }									\
-+     ASM_OUTPUT_LABEL(FILE, NAME);					\
-+   } while (0)
-+ 
-+ /* Output the size directive for a decl in rest_of_decl_compilation
-+    in the case where we did not do so before the initializer.
-+    Once we find the error_mark_node, we know that the value of
-+    size_directive_output was set
-+    by ASM_DECLARE_OBJECT_NAME when it was run for the same decl.  */
-+ 
-+ #define ASM_FINISH_DECLARE_OBJECT(FILE, DECL, TOP_LEVEL, AT_END)	 \
-+ do {									 \
-+      char *name = XSTR (XEXP (DECL_RTL (DECL), 0), 0);			 \
-+      if (!flag_inhibit_size_directive && DECL_SIZE (DECL)		 \
-+          && ! AT_END && TOP_LEVEL					 \
-+ 	 && DECL_INITIAL (DECL) == error_mark_node			 \
-+ 	 && !size_directive_output)					 \
-+        {								 \
-+ 	 size_directive_output = 1;					 \
-+ 	 fprintf (FILE, "\t%s\t ", SIZE_ASM_OP);			 \
-+ 	 assemble_name (FILE, name);					 \
-+ 	 putc (',', FILE);						 \
-+ 	 fprintf (FILE, HOST_WIDE_INT_PRINT_DEC,			 \
-+ 		  int_size_in_bytes (TREE_TYPE (DECL))); 		 \
-+ 	fputc ('\n', FILE);						 \
-+        }								 \
-+    } while (0)
-+ 
-+ /* This is how to declare the size of a function.  */
-+ 
-+ #define ASM_DECLARE_FUNCTION_SIZE(FILE, FNAME, DECL)			\
-+   do {									\
-+     if (!flag_inhibit_size_directive)					\
-+       {									\
-+         char label[256];						\
-+ 	static int labelno;						\
-+ 	labelno++;							\
-+ 	ASM_GENERATE_INTERNAL_LABEL (label, "Lfe", labelno);		\
-+ 	ASM_OUTPUT_INTERNAL_LABEL (FILE, "Lfe", labelno);		\
-+ 	fprintf (FILE, "\t%s\t ", SIZE_ASM_OP);				\
-+ 	assemble_name (FILE, (FNAME));					\
-+         fprintf (FILE, ",");						\
-+ 	assemble_name (FILE, label);					\
-+         fprintf (FILE, "-");						\
-+ 	assemble_name (FILE, (FNAME));					\
-+ 	putc ('\n', FILE);						\
-+       }									\
-+   } while (0)
-+ 
-+ /* This is how we tell the assembler that two symbols have the same value.  */
-+ 
-+ #define ASM_OUTPUT_DEF(FILE,NAME1,NAME2) \
-+   do { assemble_name(FILE, NAME1); 	 \
-+        fputs(" = ", FILE);		 \
-+        assemble_name(FILE, NAME2);	 \
-+        fputc('\n', FILE); } while (0)
-+ 
-+ /* A table of bytes codes used by the ASM_OUTPUT_ASCII and
-+    ASM_OUTPUT_LIMITED_STRING macros.  Each byte in the table
-+    corresponds to a particular byte value [0..255].  For any
-+    given byte value, if the value in the corresponding table
-+    position is zero, the given character can be output directly.
-+    If the table value is 1, the byte must be output as a \ooo
-+    octal escape.  If the tables value is anything else, then the
-+    byte value should be output as a \ followed by the value
-+    in the table.  Note that we can use standard UN*X escape
-+    sequences for many control characters, but we don't use
-+    \a to represent BEL because some svr4 assemblers (e.g. on
-+    the i386) don't know about that.  Also, we don't use \v
-+    since some versions of gas, such as 2.2 did not accept it.  */
-+ 
-+ #define ESCAPES \
-+ "\1\1\1\1\1\1\1\1btn\1fr\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\
-+ \0\0\"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
-+ \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\\\0\0\0\
-+ \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\
-+ \1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\
-+ \1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\
-+ \1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\
-+ \1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1"
-+ 
-+ /* Some svr4 assemblers have a limit on the number of characters which
-+    can appear in the operand of a .string directive.  If your assembler
-+    has such a limitation, you should define STRING_LIMIT to reflect that
-+    limit.  Note that at least some svr4 assemblers have a limit on the
-+    actual number of bytes in the double-quoted string, and that they
-+    count each character in an escape sequence as one byte.  Thus, an
-+    escape sequence like \377 would count as four bytes.
-+ 
-+    If your target assembler doesn't support the .string directive, you
-+    should define this to zero.
-+ */
-+ 
-+ #define STRING_LIMIT	((unsigned) 256)
-+ 
-+ #define STRING_ASM_OP	".string"
-+ 
-+ /*
-+  * We always use gas here, so we don't worry about ECOFF assembler problems.
-+  */
-+ #undef TARGET_GAS
-+ #define TARGET_GAS	(1)
-+ 
-+ #if 0
-+ #undef PREFERRED_DEBUGGING_TYPE
-+ #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
-+ #endif
-+ 
-+ /* The following macros are stolen from i386v4.h */
-+ /* These have to be defined to get PIC code correct */
-+ 
-+ /* This is how to output an element of a case-vector that is relative.
-+    This is only used for PIC code.  See comments by the `casesi' insn in
-+    i386.md for an explanation of the expression this outputs. */
-+ 
-+ #undef ASM_OUTPUT_ADDR_DIFF_ELT
-+ #define ASM_OUTPUT_ADDR_DIFF_ELT(FILE, BODY, VALUE, REL) \
-+   fprintf (FILE, "\t.long _GLOBAL_OFFSET_TABLE_+[.-%s%d]\n", LPREFIX, VALUE)
-+ 
-+ /* Indicate that jump tables go in the text section.  This is
-+    necessary when compiling PIC code.  */
-+ 
-+ #define JUMP_TABLES_IN_TEXT_SECTION 1
-+ 
-+ /* Default to pcc-struct-return, because this is the ELF abi and
-+    we don't care about compatibility with older gcc versions.  */
-+ #define DEFAULT_PCC_STRUCT_RETURN 1
-+ 
-+ /* Profiling routines, partially copied from i386/osfrose.h.  */
-+ 
-+ /* Redefine this to use %eax instead of %edx.  */
-+ #undef FUNCTION_PROFILER
-+ #define FUNCTION_PROFILER(FILE, LABELNO)  \
-+ {									\
-+   if (flag_pic)								\
-+     {									\
-+       fprintf (FILE, "\tcall mcount@PLT\n");				\
-+     }									\
-+   else									\
-+     {									\
-+       fprintf (FILE, "\tcall mcount\n");				\
-+     }									\
-+ }
-+ 
-+ /* Put relocations in the constant pool in the writable data section.  */
-+ #undef SELECT_RTX_SECTION
-+ #define SELECT_RTX_SECTION(MODE,RTX)					\
-+ {									\
-+   if (flag_pic && symbolic_operand (RTX))				\
-+     data_section ();							\
-+   else									\
-+     readonly_data_section ();						\
-+ }
--- a/cross/COMMON/patches-egcs/patch-ah
+++ b/cross/COMMON/patches-egcs/patch-ah
@@ -1,82 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2000/02/19 09:46:14 tsutsui Exp $
-
--- config.sub.orig	Sat Apr  4 01:21:57 1998
-+++ config.sub	Thu Feb 17 01:16:53 2000
-@@ -165,7 +165,7 @@
- 		| alpha | alphaev5 | alphaev56 | alphapca56 | alphaev6 \
- 		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
- 		| 1750a | dsp16xx | pdp11 \
-		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
-+		| mips64 | mipsel | mipseb | mips64el | mips64orion | mips64orionel \
- 		| mipstx39 | mipstx39el \
- 		| sparc | sparclet | sparclite | sparc64 | v850)
- 		basic_machine=$basic_machine-unknown
-@@ -212,7 +212,7 @@
- 	      | alphaev6-* | we32k-* | cydra-* | ns16k-* | pn-* | np1-* \
- 	      | xps100-* | clipper-* | orion-* \
- 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | mips64-* | mipsel-* \
-+	      | sparc64-* | mips64-* | mipsel-* | mipseb-* \
- 	      | mips64el-* | mips64orion-* | mips64orionel-* \
- 	      | mipstx39-* | mipstx39el-* \
- 	      | f301-*)
--- gcc/config.sub.orig	Sun Apr  5 02:37:36 1998
-+++ gcc/config.sub	Fri Feb 18 19:18:11 2000
-@@ -154,7 +154,7 @@
- 		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
- 		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
- 		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
-		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
-+		| mips64 | mipsel | mipseb | mips64el | mips64orion | mips64orionel \
- 		| mipstx39 | mipstx39el \
- 		| sparc | sparclet | sparclite | sparc64 | v850)
- 		basic_machine=$basic_machine-unknown
-@@ -182,7 +182,7 @@
- 	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
- 	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
- 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | mips64-* | mipsel-* \
-+	      | sparc64-* | mips64-* | mipsel-* | mipseb-* \
- 	      | mips64el-* | mips64orion-* | mips64orionel-*  \
- 	      | mipstx39-* | mipstx39el-* \
- 	      | f301-*)
--- gcc/config/mips/netbsd.h.orig	Thu Feb 17 01:07:26 2000
-+++ gcc/config/mips/netbsd.h	Fri Feb 18 19:21:45 2000
-@@ -20,7 +20,11 @@
- 
- /* Define default target values. */
- 
-+#ifdef TARGET_BIG_ENDIAN_DEFAULT
-+#define TARGET_ENDIAN_DEFAULT MASK_BIG_ENDIAN
-+#else
- #define TARGET_ENDIAN_DEFAULT 0
-+#endif
- #define TARGET_DEFAULT MASK_GAS
- 
- /* Get generic mips ELF definitions. */
-@@ -40,10 +44,17 @@
- /* Define mips-specific netbsd predefines... */
- 
- #undef CPP_PREDEFINES
-+#ifdef TARGET_BIG_ENDIAN_DEFAULT
-+#define CPP_PREDEFINES \
-+ "-D__ANSI_COMPAT -DMIPSEB -DR3000 -DSYSTYPE_BSD -D_SYSTYPE_BSD \
-+  -D__NetBSD__ -D__ELF__ -Dmips -D__NO_LEADING_UNDERSCORES__ -D__GP_SUPPORT__ \
-+  -D_R3000 -Asystem(unix) -Asystem(NetBSD) -Amachine(mips)"
-+#else
- #define CPP_PREDEFINES \
-  "-D__ANSI_COMPAT -DMIPSEL -DR3000 -DSYSTYPE_BSD -D_SYSTYPE_BSD \
-   -D__NetBSD__ -D__ELF__ -Dmips -D__NO_LEADING_UNDERSCORES__ -D__GP_SUPPORT__ \
-   -D_R3000 -Asystem(unix) -Asystem(NetBSD) -Amachine(mips)"
-+#endif
- 
- /* Always uses gas.  */
- 
--- /dev/null	Fri Feb 18 19:02:34 2000
-+++ gcc/config/mips/t-mipseb	Fri Feb 18 19:22:08 2000
-@@ -0,0 +1 @@
-+T_CFLAGS +=-DTARGET_BIG_ENDIAN_DEFAULT
--- /dev/null	Fri Feb 18 19:02:34 2000
-+++ gcc/config/mips/t-mipsel	Fri Feb 18 19:22:20 2000
-@@ -0,0 +1 @@
-+T_CFLAGS +=-DTARGET_LITTLE_ENDIAN_DEFAULT
--- a/cross/COMMON/patches-egcs/patch-ai
+++ b/cross/COMMON/patches-egcs/patch-ai
@@ -1,14 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2000/06/11 18:45:54 mycroft Exp $
-
--- gcc/c-common.c.orig	Tue Aug 18 18:49:52 1998
-+++ gcc/c-common.c	Sun Jun 11 14:41:38 2000
-@@ -1314,7 +1314,8 @@
- 
-   if (integer_zerop (format_tree))
-     {
-      warning ("null format string");
-+      if (pedantic)
-+	warning ("null format string");
-       return;
-     }
-   if (TREE_CODE (format_tree) != ADDR_EXPR)
--- a/cross/COMMON/patches-egcs/patch-aj
+++ b/cross/COMMON/patches-egcs/patch-aj
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2000/09/30 19:04:24 fredb Exp $
-
--- gcc/cpphash.c.orig	Thu Jun  1 01:38:11 2000
-+++ gcc/cpphash.c	Thu Jun  1 01:54:57 2000
-@@ -88,7 +88,7 @@
-   /* Lookups pass no hashcode.  #define passes one.  Look for no hashcode. */
-   if (islookup && !strncmp(name, "unix", len) && !warned_unix) {
-     warned_unix++;
-    warning("deprecated symbol \"unix\" is no longer predefined");
-+    cpp_warning(pfile, "deprecated symbol \"unix\" is no longer predefined");
-   }
-   return (HASHNODE *) 0;
- }
--- a/cross/COMMON/patches-egcs/patch-ak
+++ b/cross/COMMON/patches-egcs/patch-ak
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/01/05 19:30:45 joerg Exp $
-
--- gcc/f/com.h.orig	2005-12-23 17:46:13.000000000 +0000
-+++ gcc/f/com.h
-@@ -301,7 +301,7 @@ void ffecom_finish_decl (tree decl, tree
- void ffecom_finish_progunit (void);
- tree ffecom_get_invented_identifier (char *pattern, char *text,
- 				     int number);
-ffeinfoKindtype ffecom_gfrt_basictype (ffecomGfrt ix);
-+ffeinfoBasictype ffecom_gfrt_basictype (ffecomGfrt ix);
- ffeinfoKindtype ffecom_gfrt_kindtype (ffecomGfrt ix);
- void ffecom_init_0 (void);
- void ffecom_init_2 (void);
--- a/cross/COMMON/patches-egcs/patch-sh
+++ b/cross/COMMON/patches-egcs/patch-sh
@@ -1,540 +0,0 @@
-$NetBSD: patch-sh,v 1.1 2001/01/04 01:19:32 itojun Exp $
-
--- config.sub-	Wed Jan  3 21:37:56 2001
-+++ config.sub	Wed Jan  3 21:38:16 2001
-@@ -165,3 +165,3 @@
- 		| alpha | alphaev5 | alphaev56 | alphapca56 | alphaev6 \
-		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
-+		| we32k | ns16k | clipper | i370 | sh | shel | powerpc | powerpcle \
- 		| 1750a | dsp16xx | pdp11 \
-@@ -213,3 +213,3 @@
- 	      | xps100-* | clipper-* | orion-* \
-	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-+	      | sparclite-* | pdp11-* | sh-* | shel-* | powerpc-* | powerpcle-* \
- 	      | sparc64-* | mips64-* | mipsel-* | mipseb-* \
-@@ -679,2 +679,5 @@
- 		os=-hms
-+		;;
-+	shel)
-+		basic_machine=sh-hitachi
- 		;;
--- libio/floatconv.c-	Wed Jan  3 21:40:32 2001
-+++ libio/floatconv.c	Wed Jan  3 21:40:42 2001
-@@ -151,7 +151,7 @@
- #if defined(MIPSEL) || defined(__alpha__)
- #define IEEE_8087
- #endif
-#if defined(__sparc__) || defined(sparc) || defined(MIPSEB)
-+#if defined(__sparc__) || defined(sparc) || defined(MIPSEB) || defined(__sh__)
- #define IEEE_MC68k
- #endif
- 
--- gcc/configure.in-	Wed Jan  3 21:41:07 2001
-+++ gcc/configure.in	Wed Jan  3 21:42:27 2001
-@@ -318,6 +318,9 @@
- 	pyramid-*-*)
- 		cpu_type=pyr
- 		;;
-+	sh*-*-*)
-+		cpu_type=sh
-+		;;
- 	sparc*-*-*)
- 		cpu_type=sparc
- 		;;
-@@ -2570,6 +2573,30 @@
- 	sh-*-rtems*)
- 		tmake_file="sh/t-sh t-rtems"
- 		tm_file=sh/rtems.h
-+		float_format=sh
-+		;;
-+	sh-*-netbsdcoff)
-+		tm_file=sh/netbsdcoff.h
-+		use_collect2=
-+		fixincludes=fixinc.wrap
-+		float_format=sh
-+		;;
-+	shel-*-netbsdcoff)
-+		tm_file=sh/netbsdelcoff.h
-+		use_collect2=
-+		fixincludes=fixinc.wrap
-+		float_format=sh
-+		;;
-+	sh-*-netbsdelf)
-+		tm_file=sh/netbsdelf.h
-+		use_collect2=
-+		fixincludes=fixinc.wrap
-+		float_format=sh
-+		;;
-+	shel-*-netbsdelf)
-+		tm_file=sh/netbsdelelf.h
-+		use_collect2=
-+		fixincludes=fixinc.wrap
- 		float_format=sh
- 		;;
- 	sh-*-*)
--- gcc/configure-	Wed Jan  3 21:41:09 2001
-+++ gcc/configure	Wed Jan  3 21:42:37 2001
-@@ -2220,6 +2220,9 @@
- 	pyramid-*-*)
- 		cpu_type=pyr
- 		;;
-+	sh*-*-*)
-+		cpu_type=sh
-+		;;
- 	sparc*-*-*)
- 		cpu_type=sparc
- 		;;
-@@ -4482,6 +4485,30 @@
- 	sh-*-rtems*)
- 		tmake_file="sh/t-sh t-rtems"
- 		tm_file=sh/rtems.h
-+		float_format=sh
-+		;;
-+	sh-*-netbsdcoff)
-+		tm_file=sh/netbsdcoff.h
-+		use_collect2=
-+		fixincludes=fixinc.wrap
-+		float_format=sh
-+		;;
-+	shel-*-netbsdcoff)
-+		tm_file=sh/netbsdelcoff.h
-+		use_collect2=
-+		fixincludes=fixinc.wrap
-+		float_format=sh
-+		;;
-+	sh-*-netbsdelf)
-+		tm_file=sh/netbsdelf.h
-+		use_collect2=
-+		fixincludes=fixinc.wrap
-+		float_format=sh
-+		;;
-+	shel-*-netbsdelf)
-+		tm_file=sh/netbsdelelf.h
-+		use_collect2=
-+		fixincludes=fixinc.wrap
- 		float_format=sh
- 		;;
- 	sh-*-*)
-diff -uN gcc/config/sh/lib1funcs.asm gcc/config/sh/lib1funcs.asm
--- gcc/config/sh/lib1funcs.asm	Wed Jan  3 21:39:06 2001
-+++ gcc/config/sh/lib1funcs.asm	Wed Jan  3 21:40:10 2001
-@@ -707,7 +707,7 @@
- 	mov.l	r0,@(0,r4)
- ___movstrSI0:
- 	rts
-	or	r0,r0,r0
-+	nop
- 
- 	.align	4
- 
-diff -uN gcc/config/sh/netbsdcoff.h gcc/config/sh/netbsdcoff.h
--- gcc/config/sh/netbsdcoff.h	Thu Jan  1 09:00:00 1970
-+++ gcc/config/sh/netbsdcoff.h	Wed Jan  3 21:43:23 2001
-@@ -0,0 +1,59 @@
-+#include <sh/sh.h>
-+
-+#undef CPP_SPEC
-+#define CPP_SPEC "%{posix:-D_POSIX_SOURCE} \
-+%{ml:-D__LITTLE_ENDIAN__} \
-+%{m1:-D__sh1__} \
-+%{m2:-D__sh2__} \
-+%{m3:-D__sh3__} \
-+%{m3e:-D__SH3E__} \
-+%{!m1:%{!m2:%{!m3:%{!m3e:-D__sh1__}}}}"
-+
-+#undef CPP_PREDEFINES
-+#define CPP_PREDEFINES "-D__sh__ -Dunix -Dsh3 -D__NetBSD__ -Asystem(unix) -Asystem(NetBSD) -Acpu(sh) -Amachine(sh)"
-+
-+/* XXX -fpic -fPIC? (msaitoh) */
-+#undef ASM_SPEC
-+#define ASM_SPEC  "%{ml:-little} %{mrelax:-relax}"
-+
-+#undef LIB_SPEC
-+#define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
-+
-+#undef LINK_SPEC
-+#define LINK_SPEC \
-+  "%{ml:-m shlunx} %{mrelax:-relax} %{!nostdlib:%{!r*:%{!e*:-e start}}} -dc -dp %{R*} %{static:-Bstatic} %{assert*}"
-+
-+/* We have atexit(3).  */
-+
-+#define HAVE_ATEXIT
-+
-+/* Implicit library calls should use memcpy, not bcopy, etc.  */
-+
-+#define TARGET_MEM_FUNCTIONS
-+
-+/* Handle #pragma weak and #pragma pack.  */
-+
-+#define HANDLE_SYSV_PRAGMA
-+
-+
-+/* Make gcc agree with <machine/ansi.h> */
-+
-+#undef SIZE_TYPE
-+#define SIZE_TYPE "unsigned int"
-+
-+#undef PTRDIFF_TYPE
-+#define PTRDIFF_TYPE "int"
-+
-+#undef WCHAR_TYPE
-+#define WCHAR_TYPE "int"
-+
-+#undef WCHAR_UNSIGNED
-+#define WCHAR_UNSIGNED 0
-+
-+#undef WCHAR_TYPE_SIZE
-+#define WCHAR_TYPE_SIZE 32
-+
-+/* Until they use ELF or something that handles dwarf2 unwinds
-+   and initialization stuff better.  */
-+#undef DWARF2_UNWIND_INFO
-+
-diff -uN gcc/config/sh/netbsdelcoff.h gcc/config/sh/netbsdelcoff.h
--- gcc/config/sh/netbsdelcoff.h	Thu Jan  1 09:00:00 1970
-+++ gcc/config/sh/netbsdelcoff.h	Wed Jan  3 21:43:23 2001
-@@ -0,0 +1,64 @@
-+#include <sh/sh.h>
-+
-+#undef CPP_SPEC
-+#define CPP_SPEC "%{posix:-D_POSIX_SOURCE} \
-+%{!mb:-D__LITTLE_ENDIAN__} \
-+%{m1:-D__sh1__} \
-+%{m2:-D__sh2__} \
-+%{m3:-D__sh3__} \
-+%{m3e:-D__SH3E__} \
-+%{!m1:%{!m2:%{!m3:%{!m3e:-D__sh1__}}}}"
-+
-+#undef CPP_PREDEFINES
-+#define CPP_PREDEFINES "-D__sh__ -Dunix -Dsh3 -D__NetBSD__ -Asystem(unix) -Asystem(NetBSD) -Acpu(sh) -Amachine(sh)"
-+
-+/* XXX -fpic -fPIC? (msaitoh) */
-+#undef ASM_SPEC
-+#define ASM_SPEC  "%{!mb:-little} %{mrelax:-relax}"
-+
-+#undef LIB_SPEC
-+#define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
-+
-+#undef LINK_SPEC
-+#define LINK_SPEC \
-+  "%{!mb:-m shlunx} %{mrelax:-relax} %{!nostdlib:%{!r*:%{!e*:-e start}}} -dc -dp %{R*} %{static:-Bstatic} %{assert*}"
-+
-+/* set default to little endian */
-+
-+#undef TARGET_DEFAULT
-+#define TARGET_DEFAULT LITTLE_ENDIAN_BIT
-+
-+/* We have atexit(3).  */
-+
-+#define HAVE_ATEXIT
-+
-+/* Implicit library calls should use memcpy, not bcopy, etc.  */
-+
-+#define TARGET_MEM_FUNCTIONS
-+
-+/* Handle #pragma weak and #pragma pack.  */
-+
-+#define HANDLE_SYSV_PRAGMA
-+
-+
-+/* Make gcc agree with <machine/ansi.h> */
-+
-+#undef SIZE_TYPE
-+#define SIZE_TYPE "unsigned int"
-+
-+#undef PTRDIFF_TYPE
-+#define PTRDIFF_TYPE "int"
-+
-+#undef WCHAR_TYPE
-+#define WCHAR_TYPE "int"
-+
-+#undef WCHAR_UNSIGNED
-+#define WCHAR_UNSIGNED 0
-+
-+#undef WCHAR_TYPE_SIZE
-+#define WCHAR_TYPE_SIZE 32
-+
-+/* Until they use ELF or something that handles dwarf2 unwinds
-+   and initialization stuff better.  */
-+#undef DWARF2_UNWIND_INFO
-+
-diff -uN gcc/config/sh/netbsdelelf.h gcc/config/sh/netbsdelelf.h
--- gcc/config/sh/netbsdelelf.h	Thu Jan  1 09:00:00 1970
-+++ gcc/config/sh/netbsdelelf.h	Wed Jan  3 21:43:23 2001
-@@ -0,0 +1,142 @@
-+/* Definitions of target machine for gcc for Hitachi Super-H using ELF.
-+   Copyright (C) 1996 Free Software Foundation, Inc.
-+   Contributed by Ian Lance Taylor <ian@cygnus.com>.
-+
-+This file is part of GNU CC.
-+
-+GNU CC is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 2, or (at your option)
-+any later version.
-+
-+GNU CC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GNU CC; see the file COPYING.  If not, write to
-+the Free Software Foundation, 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+/* Get generic SH definitions. */
-+#include <sh/sh.h>
-+
-+/* No SDB debugging info.  */
-+#undef SDB_DEBUGGING_INFO
-+
-+/* Undefine some macros defined in both sh.h and svr4.h.  */
-+#undef IDENT_ASM_OP
-+#undef ASM_FILE_END
-+#undef ASM_OUTPUT_SOURCE_LINE
-+#undef DBX_OUTPUT_MAIN_SOURCE_FILE_END
-+#undef CTORS_SECTION_ASM_OP
-+#undef DTORS_SECTION_ASM_OP
-+#undef ASM_OUTPUT_SECTION_NAME
-+#undef ASM_OUTPUT_CONSTRUCTOR
-+#undef ASM_OUTPUT_DESTRUCTOR
-+#undef ASM_DECLARE_FUNCTION_NAME
-+#undef PREFERRED_DEBUGGING_TYPE
-+#undef MAX_OFILE_ALIGNMENT
-+
-+/* Be ELF-like.  */
-+#include <svr4.h>
-+
-+/* Get generic NetBSD ELF definitions. */
-+#define NETBSD_ELF
-+#include <netbsd.h>
-+
-+/* The prefix to add to user-visible assembler symbols.
-+   Note that svr4.h redefined it from the original value (that we want)
-+   in sh.h */
-+
-+#undef USER_LABEL_PREFIX
-+#define USER_LABEL_PREFIX "_"
-+
-+#undef LOCAL_LABEL_PREFIX
-+#define LOCAL_LABEL_PREFIX "."
-+
-+#undef ASM_FILE_START
-+#define ASM_FILE_START(FILE) do {				\
-+  output_file_directive ((FILE), main_input_filename);		\
-+  if (TARGET_LITTLE_ENDIAN)					\
-+    fprintf ((FILE), "\t.little\n");				\
-+} while (0)
-+
-+#undef CPP_SPEC
-+#define CPP_SPEC "%{posix:-D_POSIX_SOURCE} \
-+%{!mb:-D__LITTLE_ENDIAN__} \
-+%{m1:-D__sh1__} \
-+%{m2:-D__sh2__} \
-+%{m3:-D__sh3__} \
-+%{m3e:-D__SH3E__} \
-+%{!m1:%{!m2:%{!m3:%{!m3e:-D__sh1__}}}}"
-+
-+/* Let code know that this is ELF.  */
-+#define CPP_PREDEFINES \
-+"-D__sh__ -D__sh3__ -D__NetBSD__ -D__ELF__ -D__KPRINTF_ATTRIBUTE__ \
-+-Asystem(unix) -Asystem(NetBSD) -Acpu(sh3) -Amachine(sh3)"
-+
-+/* svr4.h undefined DBX_REGISTER_NUMBER, so we need to define it
-+   again.  */
-+#define DBX_REGISTER_NUMBER(REGNO)	\
-+  (((REGNO) >= 22 && (REGNO) <= 39) ? ((REGNO) + 1) : (REGNO))
-+
-+/* SH ELF, unlike most ELF implementations, uses underscores before
-+   symbol names.  */
-+#undef ASM_OUTPUT_LABELREF
-+#define ASM_OUTPUT_LABELREF(STREAM,NAME) \
-+  asm_fprintf (STREAM, "%U%s", NAME)
-+
-+#undef ASM_GENERATE_INTERNAL_LABEL
-+#define ASM_GENERATE_INTERNAL_LABEL(STRING, PREFIX, NUM) \
-+  sprintf ((STRING), "*%s%s%d", LOCAL_LABEL_PREFIX, (PREFIX), (NUM))
-+
-+#undef ASM_OUTPUT_INTERNAL_LABEL
-+#define ASM_OUTPUT_INTERNAL_LABEL(FILE,PREFIX,NUM) \
-+  asm_fprintf ((FILE), "%L%s%d:\n", (PREFIX), (NUM))
-+
-+#undef  ASM_OUTPUT_SOURCE_LINE
-+#define ASM_OUTPUT_SOURCE_LINE(file, line)				\
-+do									\
-+  {									\
-+    static int sym_lineno = 1;						\
-+    asm_fprintf ((file), ".stabn 68,0,%d,%LLM%d-",			\
-+	     (line), sym_lineno);					\
-+    assemble_name ((file),						\
-+		   XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0));\
-+    asm_fprintf ((file), "\n%LLM%d:\n", sym_lineno);			\
-+    sym_lineno += 1;							\
-+  }									\
-+while (0)
-+
-+#undef DBX_OUTPUT_MAIN_SOURCE_FILE_END
-+#define DBX_OUTPUT_MAIN_SOURCE_FILE_END(FILE, FILENAME)			\
-+do {									\
-+  text_section ();							\
-+  fprintf ((FILE), "\t.stabs \"\",%d,0,0,Letext\nLetext:\n", N_SO);	\
-+} while (0)
-+
-+/* HANDLE_SYSV_PRAGMA (defined by svr4.h) takes precedence over HANDLE_PRAGMA.
-+   We want to use the HANDLE_PRAGMA from sh.h.  */
-+#undef HANDLE_SYSV_PRAGMA
-+
-+#undef ASM_SPEC
-+#define ASM_SPEC \
-+ "%{!mb:-little} %{mrelax:-relax} %{fpic:-k} %{fPIC:-k}"
-+
-+#undef LINK_SPEC
-+#define	LINK_SPEC \
-+ "%{!mb:-m elf32shlunx} %{mrelax:-relax} \
-+  %{assert*} \
-+  %{shared:-shared} \
-+  %{!shared: \
-+    -dc -dp \
-+    %{!nostdlib:%{!r*:%{!e*:-e __start}}} \
-+    %{!static: \
-+      %{rdynamic:-export-dynamic} \
-+      %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.elf_so}} \
-+    %{static:-static}}"
-+
-+#undef TARGET_DEFAULT
-+#define TARGET_DEFAULT LITTLE_ENDIAN_BIT
-diff -uN gcc/config/sh/netbsdelf.h gcc/config/sh/netbsdelf.h
--- gcc/config/sh/netbsdelf.h	Thu Jan  1 09:00:00 1970
-+++ gcc/config/sh/netbsdelf.h	Wed Jan  3 21:43:23 2001
-@@ -0,0 +1,130 @@
-+/* Definitions of target machine for gcc for Hitachi Super-H using ELF.
-+   Copyright (C) 1996 Free Software Foundation, Inc.
-+   Contributed by Ian Lance Taylor <ian@cygnus.com>.
-+
-+This file is part of GNU CC.
-+
-+GNU CC is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 2, or (at your option)
-+any later version.
-+
-+GNU CC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GNU CC; see the file COPYING.  If not, write to
-+the Free Software Foundation, 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+/* Get generic SH definitions. */
-+#include <sh/sh.h>
-+
-+/* No SDB debugging info.  */
-+#undef SDB_DEBUGGING_INFO
-+
-+/* Undefine some macros defined in both sh.h and svr4.h.  */
-+#undef IDENT_ASM_OP
-+#undef ASM_FILE_END
-+#undef ASM_OUTPUT_SOURCE_LINE
-+#undef DBX_OUTPUT_MAIN_SOURCE_FILE_END
-+#undef CTORS_SECTION_ASM_OP
-+#undef DTORS_SECTION_ASM_OP
-+#undef ASM_OUTPUT_SECTION_NAME
-+#undef ASM_OUTPUT_CONSTRUCTOR
-+#undef ASM_OUTPUT_DESTRUCTOR
-+#undef ASM_DECLARE_FUNCTION_NAME
-+#undef PREFERRED_DEBUGGING_TYPE
-+#undef MAX_OFILE_ALIGNMENT
-+
-+/* Be ELF-like.  */
-+#include <svr4.h>
-+
-+/* Get generic NetBSD ELF definitions. */
-+#define NETBSD_ELF
-+#include <netbsd.h>
-+
-+/* The prefix to add to user-visible assembler symbols.
-+   Note that svr4.h redefined it from the original value (that we want)
-+   in sh.h */
-+
-+#undef USER_LABEL_PREFIX
-+#define USER_LABEL_PREFIX "_"
-+
-+#undef LOCAL_LABEL_PREFIX
-+#define LOCAL_LABEL_PREFIX "."
-+
-+#undef ASM_FILE_START
-+#define ASM_FILE_START(FILE) do {				\
-+  output_file_directive ((FILE), main_input_filename);		\
-+  if (TARGET_LITTLE_ENDIAN)					\
-+    fprintf ((FILE), "\t.little\n");				\
-+} while (0)
-+
-+/* Let code know that this is ELF.  */
-+#define CPP_PREDEFINES \
-+"-D__sh__ -D__sh3__ -D__NetBSD__ -D__ELF__ -D__KPRINTF_ATTRIBUTE__ \
-+-Asystem(unix) -Asystem(NetBSD) -Acpu(sh3) -Amachine(sh3)"
-+
-+/* svr4.h undefined DBX_REGISTER_NUMBER, so we need to define it
-+   again.  */
-+#define DBX_REGISTER_NUMBER(REGNO)	\
-+  (((REGNO) >= 22 && (REGNO) <= 39) ? ((REGNO) + 1) : (REGNO))
-+
-+/* SH ELF, unlike most ELF implementations, uses underscores before
-+   symbol names.  */
-+#undef ASM_OUTPUT_LABELREF
-+#define ASM_OUTPUT_LABELREF(STREAM,NAME) \
-+  asm_fprintf (STREAM, "%U%s", NAME)
-+
-+#undef ASM_GENERATE_INTERNAL_LABEL
-+#define ASM_GENERATE_INTERNAL_LABEL(STRING, PREFIX, NUM) \
-+  sprintf ((STRING), "*%s%s%d", LOCAL_LABEL_PREFIX, (PREFIX), (NUM))
-+
-+#undef ASM_OUTPUT_INTERNAL_LABEL
-+#define ASM_OUTPUT_INTERNAL_LABEL(FILE,PREFIX,NUM) \
-+  asm_fprintf ((FILE), "%L%s%d:\n", (PREFIX), (NUM))
-+
-+#undef  ASM_OUTPUT_SOURCE_LINE
-+#define ASM_OUTPUT_SOURCE_LINE(file, line)				\
-+do									\
-+  {									\
-+    static int sym_lineno = 1;						\
-+    asm_fprintf ((file), ".stabn 68,0,%d,%LLM%d-",			\
-+	     (line), sym_lineno);					\
-+    assemble_name ((file),						\
-+		   XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0));\
-+    asm_fprintf ((file), "\n%LLM%d:\n", sym_lineno);			\
-+    sym_lineno += 1;							\
-+  }									\
-+while (0)
-+
-+#undef DBX_OUTPUT_MAIN_SOURCE_FILE_END
-+#define DBX_OUTPUT_MAIN_SOURCE_FILE_END(FILE, FILENAME)			\
-+do {									\
-+  text_section ();							\
-+  fprintf ((FILE), "\t.stabs \"\",%d,0,0,Letext\nLetext:\n", N_SO);	\
-+} while (0)
-+
-+/* HANDLE_SYSV_PRAGMA (defined by svr4.h) takes precedence over HANDLE_PRAGMA.
-+   We want to use the HANDLE_PRAGMA from sh.h.  */
-+#undef HANDLE_SYSV_PRAGMA
-+
-+#undef ASM_SPEC
-+#define ASM_SPEC \
-+ "%{ml:-little} %{mrelax:-relax} %{fpic:-k} %{fPIC:-k}"
-+
-+#undef LINK_SPEC
-+#define	LINK_SPEC \
-+ "%{ml:-m elf32shlunx} %{mrelax:-relax} \
-+  %{assert*} \
-+  %{shared:-shared} \
-+  %{!shared: \
-+    -dc -dp \
-+    %{!nostdlib:%{!r*:%{!e*:-e __start}}} \
-+    %{!static: \
-+      %{rdynamic:-export-dynamic} \
-+      %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.elf_so}} \
-+    %{static:-static}}"
--- a/cross/COMMON/patches-egcs/patch-st
+++ b/cross/COMMON/patches-egcs/patch-st
@@ -1,746 +0,0 @@
--- gcc/config/sh/sh.c.orig	Wed Feb 24 10:44:34 1999
-+++ gcc/config/sh/sh.c	Mon Jan 22 21:09:51 2001
-@@ -22,6 +22,8 @@
-    Improved by Jim Wilson (wilson@cygnus.com).  */
- 
- #include "config.h"
-+#include "system.h"
-+#include "insn-config.h"
- 
- #include <stdio.h>
- 
-@@ -29,11 +31,15 @@
- #include "tree.h"
- #include "flags.h"
- #include "insn-flags.h"
-+#include "except.h"
- #include "expr.h"
-+#include "function.h"
- #include "regs.h"
- #include "hard-reg-set.h"
- #include "output.h"
- #include "insn-attr.h"
-+#include "toplev.h"
-+#include "recog.h"
- 
- int code_for_indirect_jump_scratch = CODE_FOR_indirect_jump_scratch;
- 
-@@ -131,7 +137,8 @@
-   switch (GET_CODE (x))
-     {
-     case REG:
-      fprintf (stream, "@%s", reg_names[REGNO (x)]);
-+    case SUBREG:
-+      fprintf (stream, "@%s", reg_names[true_regnum (x)]);
-       break;
- 
-     case PLUS:
-@@ -143,13 +150,19 @@
- 	  {
- 	  case CONST_INT:
- 	    fprintf (stream, "@(%d,%s)", INTVAL (index),
-		     reg_names[REGNO (base)]);
-+		     reg_names[true_regnum (base)]);
- 	    break;
- 
- 	  case REG:
-	    fprintf (stream, "@(r0,%s)",
-		     reg_names[MAX (REGNO (base), REGNO (index))]);
-+	  case SUBREG:
-+	  {
-+		  int base_num = true_regnum (base);
-+		  int index_num = true_regnum (index);
-+
-+		  fprintf (stream, "@(r0,%s)",
-+		     reg_names[MAX (base_num,index_num)]);
- 	    break;
-+	  }
- 
- 	  default:
- 	    debug_rtx (x);
-@@ -159,11 +172,11 @@
-       break;
- 
-     case PRE_DEC:
-      fprintf (stream, "@-%s", reg_names[REGNO (XEXP (x, 0))]);
-+      fprintf (stream, "@-%s", reg_names[true_regnum (XEXP (x, 0))]);
-       break;
- 
-     case POST_INC:
-      fprintf (stream, "@%s+", reg_names[REGNO (XEXP (x, 0))]);
-+      fprintf (stream, "@%s+", reg_names[true_regnum (XEXP (x, 0))]);
-       break;
- 
-     default:
-@@ -230,16 +243,31 @@
- 	  fputs (reg_names[REGNO (x) + 1], (stream));
- 	  break;
- 	case MEM:
-	  print_operand_address (stream,
-				 XEXP (adj_offsettable_operand (x, 4), 0));
-+	  if (GET_CODE (XEXP (x, 0)) != PRE_DEC
-+	      && GET_CODE (XEXP (x, 0)) != POST_INC)
-+	    x = adj_offsettable_operand (x, 4);
-+	  print_operand_address (stream, XEXP (x, 0));
- 	  break;
- 	}
-       break;
-+    case 'o':
-+      switch (GET_CODE (x))
-+	{
-+	case PLUS:  fputs ("add", stream); break;
-+	case MINUS: fputs ("sub", stream); break;
-+	case MULT:  fputs ("mul", stream); break;
-+	case DIV:   fputs ("div", stream); break;
-+	}
-+      break;
-     default:
-       switch (GET_CODE (x))
- 	{
- 	case REG:
-	  fputs (reg_names[REGNO (x)], (stream));
-+	  if (REGNO (x) >= FIRST_FP_REG && REGNO (x) <= LAST_FP_REG
-+	      && GET_MODE_SIZE (GET_MODE (x)) > 4)
-+	    fprintf ((stream), "d%s", reg_names[REGNO (x)]+1);
-+	  else
-+	    fputs (reg_names[REGNO (x)], (stream));
- 	  break;
- 	case MEM:
- 	  output_address (XEXP (x, 0));
-@@ -402,6 +430,7 @@
-   if ((code != EQ && code != NE
-        && (sh_compare_op1 != const0_rtx
- 	   || code == GTU  || code == GEU || code == LTU || code == LEU))
-+      || (mode == DImode && sh_compare_op1 != const0_rtx)
-       || TARGET_SH3E && GET_MODE_CLASS (mode) == MODE_FLOAT)
-     sh_compare_op1 = force_reg (mode, sh_compare_op1);
- 
-@@ -694,9 +723,9 @@
- 
- char *
- output_ieee_ccmpeq (insn, operands)
-     rtx insn, operands;
-+     rtx insn, *operands;
- {
-  output_branchy_insn (NE, "bt\t%l9\\;fcmp/eq\t%1,%0", insn, operands);
-+  return output_branchy_insn (NE, "bt\t%l9\\;fcmp/eq\t%1,%0", insn, operands);
- }
- 
- /* Output to FILE the start of the assembler file.  */
-@@ -1602,8 +1631,16 @@
-     case 5:
-       {
- 	int i = 16 - size;
-	emit_insn (gen_shl_sext_ext (dest, source, GEN_INT (16 - insize),
-				     GEN_INT (16)));
-+	if (! rtx_equal_function_value_matters
-+	    && ! reload_in_progress && ! reload_completed)
-+	  emit_insn (gen_shl_sext_ext (dest, source, left_rtx, size_rtx));
-+	else
-+	  {
-+	    operands[0] = dest;
-+	    operands[2] = GEN_INT (16 - insize);
-+	    gen_shifty_hi_op (ASHIFT, operands);
-+	    emit_insn (gen_extendhisi2 (dest, gen_lowpart (HImode, dest)));
-+	  }
- 	/* Don't use gen_ashrsi3 because it generates new pseudos.  */
- 	while (--i >= 0)
- 	  gen_ashift (ASHIFTRT, 1, dest);
-@@ -2124,7 +2161,7 @@
-   for (i = XVECLEN (pattern, 0) - 1; i >= 0; i--)
-     {
-       part = XVECEXP (pattern, 0, i);
-      if (part == reg_part)
-+      if (part == reg_part || GET_CODE (part) == CLOBBER)
- 	continue;
-       if (reg_mentioned_p (reg, ((GET_CODE (part) == SET
- 				  && GET_CODE (SET_DEST (part)) == REG)
-@@ -2464,6 +2501,13 @@
-     }
-   else
-     jump = emit_jump_insn_after (gen_return (), insn);
-+  /* Emit a barrier so that reorg knows that any following instructions
-+     are not reachable via a fall-through path.
-+     But don't do this when not optimizing, since we wouldn't supress the
-+     alignment for the barrier then, and could end up with out-of-range
-+     pc-relative loads.  */
-+  if (optimize)
-+    emit_barrier_after (jump);
-   emit_label_after (bp->near_label, insn);
-   JUMP_LABEL (jump) = bp->far_label;
-   if (! invert_jump (insn, label))
-@@ -2481,7 +2525,7 @@
- 
-   for (insn = first; insn; insn = NEXT_INSN (insn))
-     {
-      rtx vec_lab, pat, prev, prevpat, x;
-+      rtx vec_lab, pat, prev, prevpat, x, braf_label;
- 
-       if (GET_CODE (insn) != JUMP_INSN
- 	  || GET_CODE (PATTERN (insn)) != ADDR_DIFF_VEC)
-@@ -2504,10 +2548,15 @@
- 	  if (GET_CODE (x) == LABEL_REF && XEXP (x, 0) == vec_lab)
- 	    break;
- 	}
-+
-+      /* Emit the reference label of the braf where it belongs, right after
-+	 the casesi_jump_2 (i.e. braf).  */
-+      braf_label = XEXP (XEXP (SET_SRC (XVECEXP (prevpat, 0, 0)), 1), 0);
-+      emit_label_after (braf_label, prev);
-+
-       /* Fix up the ADDR_DIF_VEC to be relative
- 	 to the reference address of the braf.  */
-      XEXP (XEXP (pat, 0), 0)
-	= XEXP (XEXP (SET_SRC (XVECEXP (prevpat, 0, 0)), 1), 0);
-+      XEXP (XEXP (pat, 0), 0) = braf_label;
-     }
- }
- 
--- gcc/config/sh/sh.h.orig	Mon Jun  1 23:25:44 1998
-+++ gcc/config/sh/sh.h	Mon Jan 22 21:09:51 2001
-@@ -1143,7 +1143,8 @@
-   else if ((GET_CODE (X) == POST_INC || GET_CODE (X) == PRE_DEC)	\
- 	   && BASE_REGISTER_RTX_P (XEXP ((X), 0)))			\
-     goto LABEL;								\
-  else if (GET_CODE (X) == PLUS && MODE != PSImode)			\
-+  else if (GET_CODE (X) == PLUS						\
-+      && ((MODE) != PSImode || reload_completed))			\
-     {									\
-       rtx xop0 = XEXP ((X), 0);						\
-       rtx xop1 = XEXP ((X), 1);						\
-@@ -1465,7 +1466,7 @@
-    and another.  */
- 
- #define REGISTER_MOVE_COST(SRCCLASS, DSTCLASS) \
-  ((DSTCLASS) == PR_REG ? 10		\
-+  ((DSTCLASS) == PR_REGS ? 10		\
-    : (((DSTCLASS) == FP_REGS && (SRCCLASS) == GENERAL_REGS)		\
-       || ((DSTCLASS) == GENERAL_REGS && (SRCCLASS) == FP_REGS)) ? 4	\
-    : 1)
-@@ -1566,10 +1567,10 @@
- }
- 
- #define ASM_OUTPUT_REG_PUSH(file, v) \
-  fprintf ((file), "\tmov.l\tr%s,-@r15\n", (v));
-+  fprintf ((file), "\tmov.l\tr%d,@-r15\n", (v));
- 
- #define ASM_OUTPUT_REG_POP(file, v) \
-  fprintf ((file), "\tmov.l\t@r15+,r%s\n", (v));
-+  fprintf ((file), "\tmov.l\t@r15+,r%d\n", (v));
- 
- /* The assembler's names for the registers.  RFP need not always be used as
-    the Real framepointer; it can also be used as a normal general register.
-@@ -1957,3 +1958,5 @@
- #define HAVE_ATEXIT
- 
- #define SH_DYNAMIC_SHIFT_COST (TARGET_SH3 ? (TARGET_SMALLCODE ? 1 : 2) : 20)
-+
-+#define DWARF_LINE_MIN_INSTR_LENGTH 2
--- gcc/config/sh/sh.md.orig	Thu Apr 23 22:37:16 1998
-+++ gcc/config/sh/sh.md	Mon Jan 22 21:09:51 2001
-@@ -661,7 +661,7 @@
- ;; This reload would clobber the value in r0 we are trying to store.
- ;; If we let reload allocate r0, then this problem can never happen.
- 
-(define_insn ""
-+(define_insn "udivsi3_i1"
-   [(set (match_operand:SI 0 "register_operand" "=z")
- 	(udiv:SI (reg:SI 4) (reg:SI 5)))
-    (clobber (reg:SI 18))
-@@ -674,9 +674,9 @@
-    (set_attr "needs_delay_slot" "yes")])
- 
- (define_expand "udivsi3"
-  [(set (reg:SI 4) (match_operand:SI 1 "general_operand" ""))
-+  [(set (match_dup 3) (symbol_ref:SI "__udivsi3"))
-+   (set (reg:SI 4) (match_operand:SI 1 "general_operand" ""))
-    (set (reg:SI 5) (match_operand:SI 2 "general_operand" ""))
-   (set (match_dup 3) (symbol_ref:SI "__udivsi3"))
-    (parallel [(set (match_operand:SI 0 "register_operand" "")
- 		   (udiv:SI (reg:SI 4)
- 			    (reg:SI 5)))
-@@ -685,9 +685,26 @@
- 	      (clobber (reg:SI 4))
- 	      (use (match_dup 3))])]
-   ""
-  "operands[3] = gen_reg_rtx(SImode);")
-+  "
-+{
-+  rtx first, last;
- 
-(define_insn ""
-+  operands[3] = gen_reg_rtx(SImode);
-+  /* Emit the move of the address to a pseudo outside of the libcall.  */
-+  emit_move_insn (operands[3],
-+		  gen_rtx_SYMBOL_REF (SImode, \"__udivsi3\"));
-+  last = gen_udivsi3_i1 (operands[0], operands[3]);
-+  first = emit_move_insn (gen_rtx_REG (SImode, 4), operands[1]);
-+  emit_move_insn (gen_rtx_REG (SImode, 5), operands[2]);
-+  last = emit_insn (last);
-+  /* Wrap the sequence in REG_LIBCALL / REG_RETVAL notes so that loop
-+     invariant code motion can move it.  */
-+  REG_NOTES (first) = gen_rtx_INSN_LIST (REG_LIBCALL, last, REG_NOTES (first));
-+  REG_NOTES (last) = gen_rtx_INSN_LIST (REG_RETVAL, first, REG_NOTES (last));
-+  DONE;
-+}")
-+
-+(define_insn "divsi3_i1"
-   [(set (match_operand:SI 0 "register_operand" "=z")
- 	(div:SI (reg:SI 4) (reg:SI 5)))
-    (clobber (reg:SI 18))
-@@ -702,9 +719,9 @@
-    (set_attr "needs_delay_slot" "yes")])
- 
- (define_expand "divsi3"
-  [(set (reg:SI 4) (match_operand:SI 1 "general_operand" ""))
-+  [(set (match_dup 3) (symbol_ref:SI "__sdivsi3"))
-+   (set (reg:SI 4) (match_operand:SI 1 "general_operand" ""))
-    (set (reg:SI 5) (match_operand:SI 2 "general_operand" ""))
-   (set (match_dup 3) (symbol_ref:SI "__sdivsi3"))
-    (parallel [(set (match_operand:SI 0 "register_operand" "")
- 		   (div:SI (reg:SI 4)
- 			   (reg:SI 5)))
-@@ -715,13 +732,29 @@
- 	      (clobber (reg:SI 3))
- 	      (use (match_dup 3))])]
-   ""
-  "operands[3] = gen_reg_rtx(SImode);")
-+  "
-+{
-+  rtx first, last;
-+
-+  operands[3] = gen_reg_rtx(SImode);
-+  /* Emit the move of the address to a pseudo outside of the libcall.  */
-+  emit_move_insn (operands[3], gen_rtx_SYMBOL_REF (SImode, \"__sdivsi3\"));
-+  last = gen_divsi3_i1 (operands[0], operands[3]);
-+  first = emit_move_insn (gen_rtx_REG (SImode, 4), operands[1]);
-+  emit_move_insn (gen_rtx_REG (SImode, 5), operands[2]);
-+  last = emit_insn (last);
-+  /* Wrap the sequence in REG_LIBCALL / REG_RETVAL notes so that loop
-+     invariant code motion can move it.  */
-+  REG_NOTES (first) = gen_rtx_INSN_LIST (REG_LIBCALL, last, REG_NOTES (first));
-+  REG_NOTES (last) = gen_rtx_INSN_LIST (REG_RETVAL, first, REG_NOTES (last));
-+  DONE;
-+}")
- 
- ;; -------------------------------------------------------------------------
- ;; Multiplication instructions
- ;; -------------------------------------------------------------------------
- 
-(define_insn ""
-+(define_insn "umulhisi3_i"
-   [(set (reg:SI 21)
- 	(mult:SI (zero_extend:SI (match_operand:HI 0 "arith_reg_operand" "r"))
- 		 (zero_extend:SI (match_operand:HI 1 "arith_reg_operand" "r"))))]
-@@ -729,7 +762,7 @@
-   "mulu	%1,%0"
-   [(set_attr "type" "smpy")])
- 
-(define_insn ""
-+(define_insn "mulhisi3_i"
-   [(set (reg:SI 21)
- 	(mult:SI (sign_extend:SI
- 		  (match_operand:HI 0 "arith_reg_operand" "r"))
-@@ -748,7 +781,18 @@
-    (set (match_operand:SI 0 "arith_reg_operand" "")
- 	(reg:SI 21))]
-   ""
-  "")
-+  "
-+{
-+  rtx first, last;
-+
-+  first = emit_insn (gen_mulhisi3_i (operands[1], operands[2]));
-+  last = emit_move_insn (operands[0], gen_rtx_REG (SImode, 21));
-+  /* Wrap the sequence in REG_LIBCALL / REG_RETVAL notes so that loop
-+     invariant code motion can move it.  */
-+  REG_NOTES (first) = gen_rtx_INSN_LIST (REG_LIBCALL, last, REG_NOTES (first));
-+  REG_NOTES (last) = gen_rtx_INSN_LIST (REG_RETVAL, first, REG_NOTES (last));
-+  DONE;
-+}")
- 
- (define_expand "umulhisi3"
-   [(set (reg:SI 21)
-@@ -759,7 +803,18 @@
-    (set (match_operand:SI 0 "arith_reg_operand" "")
- 	(reg:SI 21))]
-   ""
-  "")
-+  "
-+{
-+  rtx first, last;
-+
-+  first = emit_insn (gen_umulhisi3_i (operands[1], operands[2]));
-+  last = emit_move_insn (operands[0], gen_rtx_REG (SImode, 21));
-+  /* Wrap the sequence in REG_LIBCALL / REG_RETVAL notes so that loop
-+     invariant code motion can move it.  */
-+  REG_NOTES (first) = gen_rtx_INSN_LIST (REG_LIBCALL, last, REG_NOTES (first));
-+  REG_NOTES (last) = gen_rtx_INSN_LIST (REG_RETVAL, first, REG_NOTES (last));
-+  DONE;
-+}")
- 
- ;; mulsi3 on the SH2 can be done in one instruction, on the SH1 we generate
- ;; a call to a routine which clobbers known registers.
-@@ -782,7 +837,6 @@
- (define_expand "mulsi3_call"
-   [(set (reg:SI 4) (match_operand:SI 1 "general_operand" ""))
-    (set (reg:SI 5) (match_operand:SI 2 "general_operand" ""))
-   (set (match_dup 3) (symbol_ref:SI "__mulsi3"))
-    (parallel[(set (match_operand:SI 0 "register_operand" "")
- 		  (mult:SI (reg:SI 4)
- 			   (reg:SI 5)))
-@@ -792,9 +846,9 @@
- 	     (clobber (reg:SI 3))
- 	     (clobber (reg:SI 2))
- 	     (clobber (reg:SI 1))
-	     (use (match_dup 3))])]
-+	     (use (match_operand:SI 3 "register_operand" ""))])]
-   ""
-  "operands[3] = gen_reg_rtx(SImode);")
-+  "")
- 
- (define_insn "mul_l"
-   [(set (reg:SI 21)
-@@ -813,82 +867,120 @@
-   ""
-   "
- {
-+  rtx first, last;
-+
-   if (!TARGET_SH2)
-     {
-      FAIL;
-      /* ??? Does this give worse or better code?  */
-      emit_insn (gen_mulsi3_call (operands[0], operands[1], operands[2]));
-      DONE;
-+      /* The address must be set outside the libcall,
-+	 since it goes into a pseudo.  */
-+      rtx addr = force_reg (SImode, gen_rtx_SYMBOL_REF (SImode, \"__mulsi3\"));
-+      rtx insns = gen_mulsi3_call (operands[0], operands[1], operands[2], addr);
-+      first = XVECEXP (insns, 0, 0);
-+      last = XVECEXP (insns, 0, XVECLEN (insns, 0) - 1);
-+      emit_insn (insns);
-     }
-+  else
-+    {
-+      rtx macl = gen_rtx_REG (SImode, MACL_REG);
-+
-+      first = emit_insn (gen_mul_l (operands[1], operands[2]));
-+      /* consec_sets_giv can only recognize the first insn that sets a
-+	 giv as the giv insn.  So we must tag this also with a REG_EQUAL
-+	 note.  */
-+      last = emit_insn (gen_movsi_i ((operands[0]), macl));
-+    }
-+  /* Wrap the sequence in REG_LIBCALL / REG_RETVAL notes so that loop
-+     invariant code motion can move it.  */
-+  REG_NOTES (first) = gen_rtx_INSN_LIST (REG_LIBCALL, last, REG_NOTES (first));
-+  REG_NOTES (last) = gen_rtx_INSN_LIST (REG_RETVAL, first, REG_NOTES (last));
-+  DONE;
- }")
- 
- (define_insn "mulsidi3_i"
-  [(set (reg:DI 20)
-	(mult:DI (sign_extend:DI (match_operand:SI 0 "arith_reg_operand" "r"))
-		 (sign_extend:DI (match_operand:SI 1 "arith_reg_operand" "r"))))]
-+  [(set (reg:SI 20)
-+	(truncate:SI
-+	 (lshiftrt:DI (mult:DI (sign_extend:DI (match_operand:SI 0 "arith_reg_operand" "r"))
-+			       (sign_extend:DI (match_operand:SI 1 "arith_reg_operand" "r")))
-+		      (const_int 32))))
-+   (set (reg:SI 21)
-+	(mult:SI (match_dup 0)
-+		 (match_dup 1)))]
-   "TARGET_SH2"
-   "dmuls.l	%1,%0"
-   [(set_attr "type" "dmpy")])
- 
-(define_expand "mulsidi3"
-  [(set (reg:DI 20)
-+(define_insn "mulsidi3"
-+  [(set (match_operand:DI 0 "arith_reg_operand" "=r")
-+	(mult:DI (sign_extend:DI (match_operand:SI 1 "arith_reg_operand" "r"))
-+		 (sign_extend:DI (match_operand:SI 2 "arith_reg_operand" "r"))))
-+   (clobber (reg:DI 20))]
-+  "TARGET_SH2"
-+  "#")
-+
-+(define_split
-+  [(set (match_operand:DI 0 "arith_reg_operand" "")
- 	(mult:DI (sign_extend:DI (match_operand:SI 1 "arith_reg_operand" ""))
- 		 (sign_extend:DI (match_operand:SI 2 "arith_reg_operand" ""))))
-   (set (match_operand:DI 0 "arith_reg_operand" "")
-	(reg:DI 20))]
-+   (clobber (reg:DI 20))]
-   "TARGET_SH2"
-+  [(const_int 0)]
-   "
- {
-  /* We must swap the two words when copying them from MACH/MACL to the
-     output register.  */
-  if (TARGET_LITTLE_ENDIAN)
-    {
-      rtx low_dst = operand_subword (operands[0], 0, 1, DImode);
-      rtx high_dst = operand_subword (operands[0], 1, 1, DImode);
-
-      emit_insn (gen_mulsidi3_i (operands[1], operands[2]));
-
-      emit_insn (gen_rtx (CLOBBER, VOIDmode, operands[0]));
-      emit_move_insn (low_dst, gen_rtx (REG, SImode, 21));
-      emit_move_insn (high_dst, gen_rtx (REG, SImode, 20));
-      DONE;
-    }
-+  rtx low_dst = gen_lowpart (SImode, operands[0]);
-+  rtx high_dst = gen_highpart (SImode, operands[0]);
-+
-+  emit_insn (gen_mulsidi3_i (operands[1], operands[2]));
-+
-+  emit_move_insn (low_dst, gen_rtx_REG (SImode, 21));
-+  emit_move_insn (high_dst, gen_rtx_REG (SImode, 20));
-+  /* We need something to tag the possible REG_EQUAL notes on to.  */
-+  emit_move_insn (operands[0], operands[0]);
-+  DONE;
- }")
- 
- (define_insn "umulsidi3_i"
-  [(set (reg:DI 20)
-	(mult:DI (zero_extend:DI (match_operand:SI 0 "arith_reg_operand" "r"))
-		 (zero_extend:DI (match_operand:SI 1 "arith_reg_operand" "r"))))]
-+  [(set (reg:SI 20)
-+	(truncate:SI
-+	 (lshiftrt:DI (mult:DI (zero_extend:DI (match_operand:SI 0 "arith_reg_operand" "r"))
-+			       (zero_extend:DI (match_operand:SI 1 "arith_reg_operand" "r")))
-+		      (const_int 32))))
-+   (set (reg:SI 21)
-+	(mult:SI (match_dup 0)
-+		 (match_dup 1)))]
-   "TARGET_SH2"
-   "dmulu.l	%1,%0"
-   [(set_attr "type" "dmpy")])
- 
-(define_expand "umulsidi3"
-  [(set (reg:DI 20)
-+(define_insn "umulsidi3"
-+  [(set (match_operand:DI 0 "arith_reg_operand" "=r")
-+	(mult:DI (zero_extend:DI (match_operand:SI 1 "arith_reg_operand" "r"))
-+		 (zero_extend:DI (match_operand:SI 2 "arith_reg_operand" "r"))))
-+   (clobber (reg:DI 20))]
-+  "TARGET_SH2"
-+  "#")
-+
-+(define_split
-+  [(set (match_operand:DI 0 "arith_reg_operand" "")
- 	(mult:DI (zero_extend:DI (match_operand:SI 1 "arith_reg_operand" ""))
- 		 (zero_extend:DI (match_operand:SI 2 "arith_reg_operand" ""))))
-   (set (match_operand:DI 0 "arith_reg_operand" "")
-	(reg:DI 20))]
-+   (clobber (reg:DI 20))]
-   "TARGET_SH2"
-+  [(const_int 0)]
-   "
- {
-  /* We must swap the two words when copying them from MACH/MACL to the
-     output register.  */
-  if (TARGET_LITTLE_ENDIAN)
-    {
-      rtx low_dst = operand_subword (operands[0], 0, 1, DImode);
-      rtx high_dst = operand_subword (operands[0], 1, 1, DImode);
-
-      emit_insn (gen_umulsidi3_i (operands[1], operands[2]));
-
-      emit_insn (gen_rtx (CLOBBER, VOIDmode, operands[0]));
-      emit_move_insn (low_dst, gen_rtx (REG, SImode, 21));
-      emit_move_insn (high_dst, gen_rtx (REG, SImode, 20));
-      DONE;
-    }
-+  rtx low_dst = gen_lowpart (SImode, operands[0]);
-+  rtx high_dst = gen_highpart (SImode, operands[0]);
-+
-+  emit_insn (gen_umulsidi3_i (operands[1], operands[2]));
-+
-+  emit_move_insn (low_dst, gen_rtx_REG (SImode, 21));
-+  emit_move_insn (high_dst, gen_rtx_REG (SImode, 20));
-+  /* We need something to tag the possible REG_EQUAL notes on to.  */
-+  emit_move_insn (operands[0], operands[0]);
-+  DONE;
- }")
- 
-(define_insn ""
-+(define_insn "smulsi3_highpart_i"
-   [(set (reg:SI 20)
- 	(truncate:SI
- 	 (lshiftrt:DI (mult:DI (sign_extend:DI (match_operand:SI 0 "arith_reg_operand" "r"))
-@@ -909,9 +1001,27 @@
-    (set (match_operand:SI 0 "arith_reg_operand" "")
- 	(reg:SI 20))]
-   "TARGET_SH2"
-  "")
-+  "
-+{
-+  rtx first, last;
- 
-(define_insn ""
-+  first = emit_insn (gen_smulsi3_highpart_i (operands[1], operands[2]));
-+  last = emit_move_insn (operands[0], gen_rtx_REG (SImode, 20));
-+  /* Wrap the sequence in REG_LIBCALL / REG_RETVAL notes so that loop
-+     invariant code motion can move it.  */
-+  REG_NOTES (first) = gen_rtx_INSN_LIST (REG_LIBCALL, last, REG_NOTES (first));
-+  REG_NOTES (last) = gen_rtx_INSN_LIST (REG_RETVAL, first, REG_NOTES (last));
-+  /* expand_binop can't find a suitable code in mul_highpart_optab to
-+     make a REG_EQUAL note from, so make one here.
-+     ??? Alternatively, we could put this at the calling site of expand_binop,
-+     i.e. expand_mult_highpart.  */
-+  REG_NOTES (last)
-+    = gen_rtx_EXPR_LIST (REG_EQUAL, copy_rtx (SET_SRC (single_set (first))),
-+			 REG_NOTES (last));
-+  DONE;
-+}")
-+
-+(define_insn "umulsi3_highpart_i"
-   [(set (reg:SI 20)
- 	(truncate:SI
- 	 (lshiftrt:DI (mult:DI (zero_extend:DI (match_operand:SI 0 "arith_reg_operand" "r"))
-@@ -932,7 +1042,18 @@
-    (set (match_operand:SI 0 "arith_reg_operand" "")
- 	(reg:SI 20))]
-   "TARGET_SH2"
-  "")
-+  "
-+{
-+  rtx first, last;
-+
-+  first = emit_insn (gen_umulsi3_highpart_i (operands[1], operands[2]));
-+  last = emit_move_insn (operands[0], gen_rtx_REG (SImode, 20));
-+  /* Wrap the sequence in REG_LIBCALL / REG_RETVAL notes so that loop
-+     invariant code motion can move it.  */
-+  REG_NOTES (first) = gen_rtx_INSN_LIST (REG_LIBCALL, last, REG_NOTES (first));
-+  REG_NOTES (last) = gen_rtx_INSN_LIST (REG_RETVAL, first, REG_NOTES (last));
-+  DONE;
-+}")
- 
- ;; -------------------------------------------------------------------------
- ;; Logical operations
-@@ -1825,19 +1946,20 @@
-   ""
-   "sett")
- 
-;; t/r is first, so that it will be preferred over r/r when reloading a move
-;; of a pseudo-reg into the T reg
-+;; t/r must come after r/r, lest reload will try to reload stuff like
-+;; (set (subreg:SI (mem:QI (plus:SI (reg:SI 15 r15) (const_int 12)) 0) 0)
-+;; (made from (set (subreg:SI (reg:QI 73) 0) ) into T.
- (define_insn "movsi_i"
-  [(set (match_operand:SI 0 "general_movdst_operand" "=t,r,r,r,r,r,m,<,<,xl,x,l,r")
-	(match_operand:SI 1 "general_movsrc_operand" "r,Q,rI,m,xl,t,r,x,l,r,>,>,i"))]
-+  [(set (match_operand:SI 0 "general_movdst_operand" "=r,r,t,r,r,r,m,<,<,xl,x,l,r")
-+	(match_operand:SI 1 "general_movsrc_operand" "Q,rI,r,mr,xl,t,r,x,l,r,>,>,i"))]
-   "
-    ! TARGET_SH3E
-    && (register_operand (operands[0], SImode)
-        || register_operand (operands[1], SImode))"
-   "@
-	cmp/pl	%1
- 	mov.l	%1,%0
- 	mov	%1,%0
-+	cmp/pl	%1
- 	mov.l	%1,%0
- 	sts	%1,%0
- 	movt	%0
-@@ -1848,7 +1970,7 @@
- 	lds.l	%1,%0
- 	lds.l	%1,%0
- 	fake	%1,%0"
-  [(set_attr "type" "*,pcload_si,move,load_si,move,move,store,store,pstore,move,load,pload,pcload_si")
-+  [(set_attr "type" "pcload_si,move,*,load_si,move,move,store,store,pstore,move,load,pload,pcload_si")
-    (set_attr "length" "*,*,*,*,*,*,*,*,*,*,*,*,*")])
- 
- ;; t/r must come after r/r, lest reload will try to reload stuff like
-@@ -1856,8 +1978,8 @@
- ;; ??? This allows moves from macl to fpul to be recognized, but these moves
- ;; will require a reload.
- (define_insn "movsi_ie"
-  [(set (match_operand:SI 0 "general_movdst_operand" "=r,r,t,r,r,r,m,<,<,xl,x,l,r,y,r,y")
-	(match_operand:SI 1 "general_movsrc_operand" "Q,rI,r,m,xl,t,r,x,l,r,>,>,i,r,y,y"))]
-+  [(set (match_operand:SI 0 "general_movdst_operand" "=r,r,t,r,r,r,m,<,<,xl,x,l,y,r,y,r,y")
-+	(match_operand:SI 1 "general_movsrc_operand" "Q,rI,r,mr,xl,t,r,x,l,r,>,>,>,i,r,y,y"))]
-   "TARGET_SH3E
-    && (register_operand (operands[0], SImode)
-        || register_operand (operands[1], SImode))"
-@@ -1874,16 +1996,17 @@
- 	lds	%1,%0
- 	lds.l	%1,%0
- 	lds.l	%1,%0
-+	lds.l	%1,%0
- 	fake	%1,%0
- 	lds	%1,%0
- 	sts	%1,%0
- 	! move optimized away"
-  [(set_attr "type" "pcload_si,move,*,load_si,move,move,store,store,pstore,move,load,pload,pcload_si,gp_fpul,gp_fpul,nil")
-   (set_attr "length" "*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,0")])
-+  [(set_attr "type" "pcload_si,move,*,load_si,move,move,store,store,pstore,move,load,pload,load,pcload_si,gp_fpul,gp_fpul,nil")
-+   (set_attr "length" "*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,0")])
- 
- (define_insn "movsi_i_lowpart"
-   [(set (strict_low_part (match_operand:SI 0 "general_movdst_operand" "=r,r,r,r,r,m,r"))
-	(match_operand:SI 1 "general_movsrc_operand" "Q,rI,m,xl,t,r,i"))]
-+	(match_operand:SI 1 "general_movsrc_operand" "Q,rI,mr,xl,t,r,i"))]
-    "register_operand (operands[0], SImode)
-     || register_operand (operands[1], SImode)"
-   "@
-@@ -2087,7 +2210,8 @@
-     FAIL;
-   reg = XEXP (addr, 0);
-   const_int = XEXP (addr, 1);
-  if (GET_CODE (reg) != REG || GET_CODE (const_int) != CONST_INT)
-+  if (! (BASE_REGISTER_RTX_P (reg) && INDEX_REGISTER_RTX_P (operands[2])
-+	 && GET_CODE (const_int) == CONST_INT))
-     FAIL;
-   emit_move_insn (operands[2], const_int);
-   emit_move_insn (operands[0],
-@@ -2113,7 +2237,8 @@
-     FAIL;
-   reg = XEXP (addr, 0);
-   const_int = XEXP (addr, 1);
-  if (GET_CODE (reg) != REG || GET_CODE (const_int) != CONST_INT)
-+  if (! (BASE_REGISTER_RTX_P (reg) && INDEX_REGISTER_RTX_P (operands[2])
-+	 && GET_CODE (const_int) == CONST_INT))
-     FAIL;
-   emit_move_insn (operands[2], const_int);
-   emit_move_insn (change_address (operands[1], VOIDmode,
-@@ -2249,7 +2374,7 @@
- ;; This one has the additional purpose to record a possible scratch register
- ;; for the following branch.
- (define_insn "indirect_jump_scratch"
-  [(set (match_operand 0 "register_operand" "r")
-+  [(set (match_operand 0 "register_operand" "=r")
- 	(unspec [(match_operand 1 "const_int_operand" "")] 4))]
-   ""
-   ""
-@@ -2478,7 +2603,7 @@
- {
-   int i;
- 
-  emit_call_insn (gen_call (operands[0], const0_rtx, const0_rtx, const0_rtx));
-+  emit_call_insn (gen_call (operands[0], const0_rtx));
- 
-   for (i = 0; i < XVECLEN (operands[2], 0); i++)
-     {
-@@ -2974,6 +3099,7 @@
- 	      (use (match_operand:SI 0 "arith_reg_operand" "r"))
- 	      (use (reg:SI 6))
- 	      (clobber (reg:SI 17))
-+	      (clobber (reg:SI 18))
- 	      (clobber (reg:SI 4))
- 	      (clobber (reg:SI 5))
- 	      (clobber (reg:SI 6))
-@@ -3144,10 +3270,9 @@
- 
-   size /= 8;
-   orig_address = XEXP (operands[0], 0);
-  addr_target = gen_reg_rtx (SImode);
-   shift_reg = gen_reg_rtx (SImode);
-   emit_insn (gen_movsi (shift_reg, operands[3]));
-  emit_insn (gen_addsi3 (addr_target, orig_address, GEN_INT (size - 1)));
-+  addr_target = copy_addr_to_reg (plus_constant (orig_address, size - 1));
- 
-   operands[0] = change_address (operands[0], QImode, addr_target);
-   emit_insn (gen_movqi (operands[0], gen_rtx (SUBREG, QImode, shift_reg, 0)));
--- a/cross/GenFw/DESCR
+++ b/cross/GenFw/DESCR
@@ -0,0 +1 @@
+Convert ELF to PE-COFF for UEFI
--- a/cross/GenFw/Makefile
+++ b/cross/GenFw/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2014/04/06 16:14:16 jakllsch Exp $
+
+DISTNAME=	GenFw-r15188
+PKGNAME=	GenFw-0pre15188
+CATEGORIES=	cross devel sysutils
+MASTER_SITES=	${MASTER_SITE_LOCAL:=GenFw/}
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	jakllsch@NetBSD.org
+HOMEPAGE=	http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=Edk2-buildtools
+COMMENT=	Convert ELF to PE-COFF for UEFI
+LICENSE=	2-clause-bsd
+
+WRKSRC=	${WRKDIR}/GenFw
+
+INSTALLATION_DIRS=	bin
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/GenFw ${DESTDIR}${PREFIX}/bin/GenFw
+
+.include "../../mk/bsd.pkg.mk"
--- a/cross/GenFw/PLIST
+++ b/cross/GenFw/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2014/04/06 16:14:16 jakllsch Exp $
+bin/GenFw
--- a/cross/GenFw/distinfo
+++ b/cross/GenFw/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2014/04/06 16:14:16 jakllsch Exp $
+
+SHA1 (GenFw-r15188.tar.xz) = 70b4a08bed0796ef5564589906eba43ea90d8545
+RMD160 (GenFw-r15188.tar.xz) = f9016fa23456f096388557a4d7151f36885b82dd
+Size (GenFw-r15188.tar.xz) = 134644 bytes
--- a/cross/Makefile
+++ b/cross/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.58 2014/01/17 01:50:00 jnemeth Exp $
+# $NetBSD: Makefile,v 1.61 2014/12/12 13:30:07 joerg Exp $
 #

 COMMENT=	Cross-platform development utilities

-#SUBDIR+=	COMMON	# not a real package
+SUBDIR+=	GenFw
 SUBDIR+=	atasm
 SUBDIR+=	avr-binutils
 SUBDIR+=	avr-gcc
@@ -13,6 +13,7 @@ SUBDIR+=	avrdude
 SUBDIR+=	bfd-crunchide
 SUBDIR+=	bfd-mdsetimage
 SUBDIR+=	binutils
+SUBDIR+=	binutils-mips-current
 SUBDIR+=	bossa
 SUBDIR+=	cc65
 SUBDIR+=	dasm
@@ -25,6 +26,7 @@ SUBDIR+=	freemint-ldg
 SUBDIR+=	freemint-mintbin
 SUBDIR+=	freemint-mintlib
 SUBDIR+=	freemint-pml
+SUBDIR+=	gcc-mips-current
 SUBDIR+=	h8300-elf-binutils
 SUBDIR+=	h8300-elf-gcc34
 SUBDIR+=	h8300-hms-binutils
--- a/cross/atasm/Makefile
+++ b/cross/atasm/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2012/10/03 00:10:28 asau Exp $
+# $NetBSD: Makefile,v 1.12 2014/12/15 12:37:01 jperkin Exp $
 #

-DISTNAME=	atasm104
-PKGNAME=	atasm-1.04
-PKGREVISION=	2
+DISTNAME=	atasm106
+PKGNAME=	atasm-1.06
 CATEGORIES=	devel cross emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=atasm/}
 EXTRACT_SUFX=	.zip
@@ -11,21 +10,33 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/atasm/
 COMMENT=	Cross-assembler for 6502 optimized to code for Atari 8 bit computers
+LICENSE=	gnu-gpl-v2

-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
+WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_CONFIGURE=	YES
+BUILD_DIRS=	src
+MAKE_ENV=	ZLIB="-L${BUILDLINK_PREFIX.zlib}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.zlib}/lib -lz"

 DOCDIR=		${PREFIX}/share/doc/atasm
+EXAMPLE_DIR=	${PREFIX}/share/examples/atasm

-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${DOCDIR}
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${DOCDIR} ${EXAMPLE_DIR}
+
+SUBST_CLASSES+=		docdir
+SUBST_FILES.docdir=	atasm.1.in
+SUBST_STAGE.docdir=	pre-install
+SUBST_SED.docdir=	-e 's,%%DOCDIR%%,${DOCDIR},g'
+SUBST_MESSAGE.docdir=	Edit DOCDIR variable

 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/atasm ${DESTDIR}${PREFIX}/bin/atasm
-	${SED} -e 's,%%DOCDIR%%,${DOCDIR},g' < ${WRKSRC}/atasm.1.in > ${WRKSRC}/atasm.1
-	${INSTALL_DATA} ${WRKSRC}/atasm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/atasm.txt ${DESTDIR}${DOCDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/atasm        ${DESTDIR}${PREFIX}/bin/atasm
+	${MV}              ${WRKSRC}/src/atasm.1.in ${WRKSRC}/src/atasm.1
+	${INSTALL_DATA}    ${WRKSRC}/src/atasm.1      ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA}    ${WRKSRC}/docs/atasm.pdf   ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA}    ${WRKSRC}/docs/atasm.blurb ${DESTDIR}${DOCDIR}
+.for i in iomac.lib sample.m65 sysequ.m65 test.m65
+	${INSTALL_DATA}    ${WRKSRC}/examples/${i}    ${DESTDIR}${EXAMPLE_DIR}/
+.endfor

 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/cross/atasm/PLIST
+++ b/cross/atasm/PLIST
@@ -1,4 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:39:52 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/12/09 15:10:47 mef Exp $
 bin/atasm
 man/man1/atasm.1
-share/doc/atasm/atasm.txt
+share/doc/atasm/atasm.blurb
+share/doc/atasm/atasm.pdf
+share/examples/atasm/iomac.lib
+share/examples/atasm/sample.m65
+share/examples/atasm/sysequ.m65
+share/examples/atasm/test.m65
--- a/cross/atasm/distinfo
+++ b/cross/atasm/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2011/11/29 06:11:53 sbd Exp $
+$NetBSD: distinfo,v 1.6 2014/12/15 12:37:01 jperkin Exp $

-SHA1 (atasm104.zip) = 7cee73afe97d92c8a299b6203fc9245241764810
-RMD160 (atasm104.zip) = d23221d37e3040e303fa0f7a8cfa336e58a19618
-Size (atasm104.zip) = 186653 bytes
-SHA1 (patch-aa) = 951bda526513c2176a6288d9835d3a3733c94cbb
-SHA1 (patch-ab) = 70d07b66572bafbc57f53e16f95f1567af1304a0
+SHA1 (atasm106.zip) = c016c2f6ee611e001dbd026923c29ce509979f1c
+RMD160 (atasm106.zip) = e9935d0e202bc668114af9d11fdbf396399cb6d3
+Size (atasm106.zip) = 368360 bytes
+SHA1 (patch-aa) = e040580b87e68fc7ec2230fb22bc45b5d168ca83
+SHA1 (patch-ab) = 18c516a98ae5cbae3f8df7f38ca87bd1f47b9664
--- a/cross/atasm/patches/patch-aa
+++ b/cross/atasm/patches/patch-aa
@@ -1,15 +1,21 @@
-$NetBSD: patch-aa,v 1.2 2011/11/29 06:11:53 sbd Exp $
+$NetBSD: patch-aa,v 1.4 2014/12/15 12:37:01 jperkin Exp $

 Honor CC, CFLAGS and LDFLAGS from pkgsrc.

--- Makefile.orig	2003-08-23 00:53:29.000000000 +0000
-+++ Makefile
-@@ -16,10 +16,10 @@ ZLIB    = -lz
+--- src/Makefile.orig	2009-03-17 20:39:26.000000000 +0000
+++ src/Makefile
+@@ -12,15 +12,15 @@
+ # if you are compiling under UNIX, change the above lines to 
+ # reflect the location of zlib.  I use:
+ USEZ    = -DZLIB_CAPABLE 
+-ZLIB    = -lz
+#ZLIB    = -lz
 UNIX    = -DUNIX
 
 # Compiler flags, if you are using egcs, pgcs, or gcc >2.8.1 use:
+ #CFLAGS  = -g -Wall $(USEZ) $(DOS) $(UNIX) 
 -CFLAGS  = -Wall $(USEZ) $(DOS) $(UNIX) -O3 -fomit-frame-pointer -march=pentiumpro 
-+CFLAGS  += $(USEZ) $(DOS) $(UNIX)
+CFLAGS+  = $(USEZ) $(DOS) $(UNIX)
 
 L       =  $(ZLIB) 
 -CC      = gcc
@@ -17,12 +23,13 @@ Honor CC, CFLAGS and LDFLAGS from pkgsrc.
 DESTDIR	= /usr/local/bin
 MANDIR	= /usr/local/man/man1
 DOCDIR	= /usr/local/doc/atasm
-@@ -37,7 +37,7 @@ setparse.o: symbol.h
- inc_path.o: inc_path.h inc_path.c
+@@ -42,7 +42,8 @@ symbol.o: symbol.h inc_path.h atasm_err.
 
 prog : $(OBJS)
-	$(CC) -o atasm $(OBJS) $(L)
+ 	$(CC) -o atasm $(OBJS) $(L)
+-  
 +	$(CC) $(LDFLAGS) -o atasm $(OBJS) $(L)
-   
+
 clean:  
 	rm -f *.rej *.o *~ atasm atasm.1 atasm.exe
+ 	cd ../tests && make clean
--- a/cross/atasm/patches/patch-ab
+++ b/cross/atasm/patches/patch-ab
@@ -1,20 +1,22 @@
-$NetBSD: patch-ab,v 1.1 2004/02/22 04:01:15 kristerw Exp $
+$NetBSD: patch-ab,v 1.2 2014/12/09 15:10:47 mef Exp $

--- symbol.c.orig	Sun Feb 22 04:56:22 2004
-+++ symbol.c	Sun Feb 22 04:56:45 2004
-@@ -136,6 +136,7 @@
+Make this package build when using gcc 2.95.
+
+--- symbol.c.orig	2009-03-18 05:39:26.000000000 +0900
+++ src/symbol.c	2014-12-09 23:31:26.000000000 +0900
+@@ -150,6 +150,7 @@ void addUnk(char *unk) {
       snprintf(buf,256,"=%.4x_%s=%s",invoked->orig->times,invoked->orig->name,unk);
       unk=buf;
     }
 +    {
-     unkLabel *look=isUnk(unk);
+     look=isUnk(unk);
     if (!look) {
       unkLabel *u=(unkLabel *)malloc(sizeof(unkLabel));
-@@ -144,6 +145,7 @@
+@@ -158,6 +159,7 @@ void addUnk(char *unk) {
       unkLabels=u;
       u->label=(char *)malloc(strlen(unk)+1);
       strcpy(u->label,unk);
 +      }
-     } 
+     }
   }
 }
--- a/cross/avr-binutils/Makefile
+++ b/cross/avr-binutils/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2013/12/31 00:56:17 mef Exp $
+# $NetBSD: Makefile,v 1.26 2014/10/30 21:41:57 mef Exp $

-DISTNAME=		binutils-2.23.2
+DISTNAME=		binutils-2.24
 PKGNAME=		${DISTNAME:S/^/avr-/}
 CATEGORIES=		cross
 MASTER_SITES=		${MASTER_SITE_GNU:=binutils/}
@@ -17,6 +17,15 @@ GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_GNU_CONFIGURE_HOST=	no

+# follows to devel/binutils
+# PR pkg/48504, ksh is sufficient for NetBSD 5.2 and NetBSD 6.1
+.include "../../mk/bsd.prefs.mk"
+.if !empty(MACHINE_PLATFORM:MNetBSD-[5-6].*-*) && \
+	empty(MACHINE_PLATFORM:MNetBSD-6.99.*-*)
+USE_TOOLS+=		ksh
+CONFIG_SHELL=		ksh
+.endif
+
 CONFIGURE_ARGS+=	--disable-werror --target=avr --disable-nls

 AUTO_MKDIRS=		yes
@@ -45,16 +54,6 @@ post-install:
 	${LIBTOOL} --mode install ${INSTALL_DATA} libbfd.la ${DESTDIR}${PREFIX}/avr/lib;	\
 	${INSTALL_DATA} bfd.h ${DESTDIR}${PREFIX}/avr/include;	\
 	)
-	# Rename to avoid conflict to native and other cross assembler.
-	# and clang differs its path so, (the same as h8300-elf-binutils).
-	# (SunOS 5.11 places at amd64 instead of x86_64)
-	(cd ${DESTDIR}${PREFIX};				\
-	for d in amd64/libiberty.a ${MACHINE_ARCH}/libiberty.a libiberty.a;	\
-	  do if [ -f lib/$$d ]; then				\
-		${MV}	lib/$$d	 avr/lib/libiberty.a;		\
-		break;						\
-	     fi;						\
-	  done;	)
 	# emulator/simulavr wants following header files
 	(cd ${WRKSRC}/include;					\
 	for f in ansidecl.h symcat.h; do			\
--- a/cross/avr-binutils/PLIST
+++ b/cross/avr-binutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2013/08/07 02:41:30 mef Exp $
+@comment $NetBSD: PLIST,v 1.8 2014/06/15 15:54:41 mef Exp $
 avr/bin/ar
 avr/bin/as
 avr/bin/ld
@@ -97,7 +97,6 @@ avr/lib/ldscripts/avrxmega7.xn
 avr/lib/ldscripts/avrxmega7.xr
 avr/lib/ldscripts/avrxmega7.xu
 avr/lib/libbfd.la
-avr/lib/libiberty.a
 bin/avr-addr2line
 bin/avr-ar
 bin/avr-as
--- a/cross/avr-binutils/distinfo
+++ b/cross/avr-binutils/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2013/11/19 23:06:24 dsainty Exp $
+$NetBSD: distinfo,v 1.9 2014/06/15 15:54:41 mef Exp $

-SHA1 (binutils-2.23.2.tar.bz2) = 042c51073205ebaf88c272d6168f9deb71984b56
-RMD160 (binutils-2.23.2.tar.bz2) = 9788e2a8c4a7c74360919347c3bc72040e87b898
-Size (binutils-2.23.2.tar.bz2) = 21440347 bytes
+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
--- a/cross/avr-gcc/Makefile
+++ b/cross/avr-gcc/Makefile
@@ -1,17 +1,14 @@
-# $NetBSD: Makefile,v 1.33 2013/12/08 22:27:57 joerg Exp $
+# $NetBSD: Makefile,v 1.36 2014/09/19 08:30:52 joerg Exp $

-DISTNAME=		gcc-4.5.3
-PKGNAME=		avr-gcc-4.5.3
-PKGREVISION=		1
+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,23 +16,24 @@ 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}
-CFLAGS_FOR_BUILD:=	${CFLAGS}
 MAKE_ENV+=		CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD:Q}
-CXXFLAGS_FOR_BUILD:=	${CXXFLAGS}
 MAKE_ENV+=		CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD:Q}
-CFLAGS=			# empty
-CXXFLAGS=		# empty
+MAKE_ENV+=		CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD:Q}

 SUBST_CLASSES+=		sed
 SUBST_FILES.sed=	fixincludes/fixincl.x
@@ -46,6 +44,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

@@ -57,3 +60,10 @@ INSTALLATION_DIRS+=	avr/bin
 # mpc is required since gcc-4.5.x
 .include "../../math/mpcomplex/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
+
+CFLAGS_FOR_BUILD:=	${CFLAGS}
+CXXFLAGS_FOR_BUILD:=	${CXXFLAGS}
+CPPFLAGS_FOR_BUILD:=	${CPPFLAGS}
+CFLAGS:=		# empty
+CPPFLAGS:=		# empty
+CXXFLAGS:=		# empty
--- 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
--- 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

--- a/cross/avr-gcc/distinfo
+++ b/cross/avr-gcc/distinfo
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.8 2013/08/07 03:11:35 mef Exp $
+$NetBSD: distinfo,v 1.10 2014/09/10 12:11:43 joerg 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
+SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783
--- a/cross/avr-gcc/patches/patch-gcc_config_avr_driver-avr_c
+++ b/cross/avr-gcc/patches/patch-gcc_config_avr_driver-avr_c
@@ -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]);
- 
--- a/cross/avr-gcc/patches/patch-gcc_system.h
+++ b/cross/avr-gcc/patches/patch-gcc_system.h
@@ -0,0 +1,27 @@
+$NetBSD: patch-gcc_system.h,v 1.1 2014/09/10 12:11:43 joerg Exp $
+
+--- gcc/system.h.orig	2013-04-29 18:37:29.000000000 +0000
+++ gcc/system.h
+@@ -72,18 +72,22 @@ along with GCC; see the file COPYING3.  
+ 
+ #if defined HAVE_DECL_PUTC_UNLOCKED && HAVE_DECL_PUTC_UNLOCKED
+ 
+# if !defined(__NetBSD__)
+ # ifdef HAVE_PUTC_UNLOCKED
+ #  undef putc
+ #  define putc(C, Stream) putc_unlocked (C, Stream)
+ # endif
+# endif
+ # ifdef HAVE_PUTCHAR_UNLOCKED
+ #  undef putchar
+ #  define putchar(C) putchar_unlocked (C)
+ # endif
+# if !defined(__NetBSD__)
+ # ifdef HAVE_GETC_UNLOCKED
+ #  undef getc
+ #  define getc(Stream) getc_unlocked (Stream)
+ # endif
+# endif
+ # ifdef HAVE_GETCHAR_UNLOCKED
+ #  undef getchar
+ #  define getchar() getchar_unlocked ()
--- a/cross/avr-gcc/patches/patch-libiberty_Makefile.in
+++ b/cross/avr-gcc/patches/patch-libiberty_Makefile.in
@@ -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
--- a/cross/avr-gdb/Makefile
+++ b/cross/avr-gdb/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2013/08/26 01:11:34 mef Exp $
+# $NetBSD: Makefile,v 1.20 2014/08/29 06:43:32 mef Exp $

-DISTNAME=	gdb-7.6
+DISTNAME=	gdb-7.6.1
 PKGNAME=	${DISTNAME:S/^/avr-/}
-PKGREVISION=	1
 CATEGORIES=	cross
 MASTER_SITES=	${MASTER_SITE_GNU:=gdb/}

--- a/cross/avr-gdb/distinfo
+++ b/cross/avr-gdb/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2013/08/07 05:34:14 mef Exp $
+$NetBSD: distinfo,v 1.11 2014/08/29 06:43:32 mef Exp $

-SHA1 (gdb-7.6.tar.gz) = 026f4c9e1c8152a2773354551c523acd32d7f00e
-RMD160 (gdb-7.6.tar.gz) = 986e1f92130c818d9bdac548259a5c63ddeefef8
-Size (gdb-7.6.tar.gz) = 31437633 bytes
+SHA1 (gdb-7.6.1.tar.gz) = 13beaab7d28f8591777c9271f0c20a22c70d6252
+RMD160 (gdb-7.6.1.tar.gz) = 351856b5b63ca8f03f91f1b5fc4e1eea7dae8cc9
+Size (gdb-7.6.1.tar.gz) = 31446111 bytes
 SHA1 (patch-ac) = 2975101bbbd4a2e19fb9364b494a18e3940d9bac
 SHA1 (patch-bfd_bfd-in2_h) = 66129d5e6ecac363f9f35437b0a3ca8e3b650c8c
 SHA1 (patch-opcodes_configure) = 8c0b82710653c93320230c25ace0dbb6360cf656
--- a/cross/avr-gdb/patches/patch-ac
+++ b/cross/avr-gdb/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2013/08/07 05:34:14 mef Exp $
+$NetBSD: patch-ac,v 1.3 2014/08/29 06:43:32 mef Exp $

 ERROR: [check-portability.awk] => Found test ... == ...:

--- a/cross/avr-gdb/patches/patch-bfd_bfd-in2_h
+++ b/cross/avr-gdb/patches/patch-bfd_bfd-in2_h
@@ -1,4 +1,4 @@
-$NetBSD: patch-bfd_bfd-in2_h,v 1.1 2013/08/07 05:34:14 mef Exp $
+$NetBSD: patch-bfd_bfd-in2_h,v 1.2 2014/08/29 06:43:32 mef Exp $

 Avoid following problem by clang-3.2
 ----------------
--- a/cross/avr-gdb/patches/patch-opcodes_configure
+++ b/cross/avr-gdb/patches/patch-opcodes_configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-opcodes_configure,v 1.1 2013/08/07 05:34:14 mef Exp $
+$NetBSD: patch-opcodes_configure,v 1.2 2014/08/29 06:43:32 mef Exp $

 Revert to gdb-7.5.1 to avoid following error
 (But why this is necessary is unkown yet).
--- a/cross/avr-libc/MESSAGE
+++ b/cross/avr-libc/MESSAGE
@@ -0,0 +1,6 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.2 2015/02/25 15:46:52 mef Exp $
+Man pages are installed in ${PREFIX}/share/doc/avr-libc/man/man3/
+To read those pages, for example, use
+ env MANPATH=${PREFIX}/share/doc/avr-libc/man man BOOTLOADER_SECTION
+===========================================================================
--- a/cross/avr-libc/Makefile
+++ b/cross/avr-libc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2014/02/14 13:28:49 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2015/02/25 15:46:52 mef Exp $

-DISTNAME=		avr-libc-1.8.0
-PKGREVISION=		2
+DISTNAME=		avr-libc-1.8.1
+PKGREVISION=		1
 CATEGORIES=		cross
 MASTER_SITES=		http://savannah.nongnu.org/download/avr-libc/
 EXTRACT_SUFX=		.tar.bz2
@@ -11,8 +11,11 @@ HOMEPAGE=		http://savannah.nongnu.org/projects/avr-libc
 COMMENT=		C and math library for Atmel AVR 8-bit microcontrollers
 LICENSE=		modified-bsd

-BUILD_DEPENDS+=		doxygen>=1.8.6:../../devel/doxygen
+BUILD_DEPENDS+=		doxygen>=1.8.9.1.nb1:../../devel/doxygen
 BUILD_DEPENDS+=		transfig-[0-9]*:../../print/transfig
+BUILD_DEPENDS+=		tex-adjustbox-[0-9]*:../../print/tex-adjustbox
+BUILD_DEPENDS+=		tex-collectbox-[0-9]*:../../print/tex-collectbox
+BUILD_DEPENDS+=		tex-xkeyval-[0-9]*:../../print/tex-xkeyval
 BUILD_DEPENDS+=		netpbm-[0-9]*:../../graphics/netpbm

 USE_TOOLS+=		gmake perl
@@ -23,6 +26,8 @@ CONFIGURE_ARGS+=	--build=${MACHINE_GNU_PLATFORM:Q}
 CONFIGURE_ARGS+=	--host=avr
 CONFIGURE_ARGS+=	--enable-doc
 CONFIGURE_ARGS+=	--disable-versioned-doc
+CONFIGURE_ARGS+=	CC=${PREFIX}/bin/avr-gcc
+CONFIGURE_ARGS+=	CPPFLAGS="-I${PREFIX}/include -I${PREFIX}/avr/include"

 #   In doc/examples/demo directory, we have sample Makefile both for
 #   generating *.hex file at pkg installation time, and for installing
@@ -52,22 +57,15 @@ post-install:
 		${DESTDIR}${PREFIX}/share/doc/avr-libc
 	## delete following or similar files, which includes PATH at build time.
 	##_usr_pkgsrc_cross_avr-libc_work_avr-libc-1.8.0_libc_string_.3
-	(cd ${DESTDIR}${PREFIX}/share/doc/avr-libc/man/man3; ${RM} -f *${PKGVERSION_NOREV}*)
-	set -e;	\
-	for f in Makefile demo.c demo.bin demo.hex demo.pdf \
-		demo.srec;\
-	do \
-		${INSTALL_DATA} ${WRKSRC}/doc/examples/demo/$$f \
-			${DESTDIR}${PREFIX}/share/doc/avr-libc/examples/demo; \
-	done
+	${RM} ${DESTDIR}${PREFIX}/share/doc/avr-libc/man/man3/*${PKGVERSION_NOREV}*
+.for f in Makefile demo.c demo.bin demo.hex demo.pdf demo.srec
+	${INSTALL_DATA} ${WRKSRC}/doc/examples/demo/${f} \
+		${DESTDIR}${PREFIX}/share/doc/avr-libc/examples/demo
+.endfor

 .include "../../cross/avr-binutils/buildlink3.mk"
 .include "../../cross/avr-gcc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

-# XXX: very evil hack to override CC, doing it via CONFIGURE_ENV doesn't work.
-#MAKE_ENV+=		CC=${PREFIX}/bin/avr-gcc
-#MAKE_ENV is overwritten by CC=gcc in ALL_ENV
-ALL_ENV+= CC=${PREFIX}/bin/avr-gcc
 # Not to be overridden as --mandir=${PREFIX}, put the line here.
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/share/doc/avr-libc/man
--- a/cross/avr-libc/PLIST
+++ b/cross/avr-libc/PLIST
--- a/cross/avr-libc/distinfo
+++ b/cross/avr-libc/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2013/08/07 03:18:03 mef Exp $
+$NetBSD: distinfo,v 1.11 2014/10/28 00:26:56 mef Exp $

-SHA1 (avr-libc-1.8.0.tar.bz2) = 2e3815221be8e22f5f2c07b922ce92ecfa85bade
-RMD160 (avr-libc-1.8.0.tar.bz2) = 8897a70f5b295d88d0bdc483c59f4a52936f0583
-Size (avr-libc-1.8.0.tar.bz2) = 1428776 bytes
+SHA1 (avr-libc-1.8.1.tar.bz2) = b56fe21b30341869aa768689b0f6a07d896b17fa
+RMD160 (avr-libc-1.8.1.tar.bz2) = ffc4de159690048cac1dd018e55576faed47ed45
+Size (avr-libc-1.8.1.tar.bz2) = 3230418 bytes
 SHA1 (patch-doc_Makefile.in) = e44e69a7a438c4175a8c15c0548b77df49a691d8
--- a/cross/avr-libc/patches/patch-doc_Makefile.in
+++ b/cross/avr-libc/patches/patch-doc_Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-doc_Makefile.in,v 1.1 2013/08/07 03:18:03 mef Exp $
+$NetBSD: patch-doc_Makefile.in,v 1.2 2014/08/29 04:31:12 mef Exp $

 Adding PATH at installation time for OBJCOPY = avr-objcopy etc.
 See comment on SUBST part in Makefile.
--- a/cross/avrdude/Makefile
+++ b/cross/avrdude/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2013/12/06 07:23:55 mef Exp $
+# $NetBSD: Makefile,v 1.40 2015/01/18 06:18:58 mef Exp $

-DISTNAME=		avrdude-6.0.1
+DISTNAME=		avrdude-6.1
+PKGREVISION=		1
 CATEGORIES=		cross
 MASTER_SITES=		http://download.savannah.gnu.org/releases/avrdude/

--- a/cross/avrdude/PLIST
+++ b/cross/avrdude/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.9 2011/03/28 21:42:40 zafer Exp $
+@comment $NetBSD: PLIST,v 1.10 2014/10/07 15:10:29 mef Exp $
 bin/avrdude
 info/avrdude.info
 man/man1/avrdude.1
-share/examples/avrdude/avrdude.conf
 share/doc/${DISTNAME}/avrdude-html/avrdude.html
 share/doc/${DISTNAME}/avrdude-html/avrdude_1.html
 share/doc/${DISTNAME}/avrdude-html/avrdude_10.html
@@ -16,6 +15,7 @@ share/doc/${DISTNAME}/avrdude-html/avrdude_17.html
 share/doc/${DISTNAME}/avrdude-html/avrdude_18.html
 share/doc/${DISTNAME}/avrdude-html/avrdude_19.html
 share/doc/${DISTNAME}/avrdude-html/avrdude_2.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_20.html
 share/doc/${DISTNAME}/avrdude-html/avrdude_3.html
 share/doc/${DISTNAME}/avrdude-html/avrdude_4.html
 share/doc/${DISTNAME}/avrdude-html/avrdude_5.html
@@ -27,3 +27,4 @@ share/doc/${DISTNAME}/avrdude-html/avrdude_abt.html
 share/doc/${DISTNAME}/avrdude-html/avrdude_toc.html
 share/doc/${DISTNAME}/avrdude.pdf
 share/doc/${DISTNAME}/avrdude.ps
+share/examples/avrdude/avrdude.conf
--- a/cross/avrdude/distinfo
+++ b/cross/avrdude/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.11 2013/12/06 07:27:15 mef Exp $
+$NetBSD: distinfo,v 1.12 2014/10/07 15:10:29 mef Exp $

-SHA1 (avrdude-6.0.1.tar.gz) = b0f440f1b1ba3890da6e5b752003ca99e550e3bf
-RMD160 (avrdude-6.0.1.tar.gz) = 412483e87c88d9111729db6e3f94acc81b04e145
-Size (avrdude-6.0.1.tar.gz) = 692284 bytes
+SHA1 (avrdude-6.1.tar.gz) = 15525cbff5918568ef3955d871dbb94feaf83c79
+RMD160 (avrdude-6.1.tar.gz) = f2c31951c0941e86ff6deab6bd0348b54d05658c
+Size (avrdude-6.1.tar.gz) = 714595 bytes
 SHA1 (patch-aa) = 619f682af2e8eff36684993b331ba37cd1b446b6
 SHA1 (patch-ab) = a9105ae562c078eec5c87df6e7f27a80184bb6d4
 SHA1 (patch-ac) = df871808200e5732f77d50ef2d7fb51234173445
 SHA1 (patch-ad) = f9e7465b355f5b3feda8868287d6aaa5cd1dcd28
 SHA1 (patch-ae) = 4ad74b5abe90ddf29dd419043a2e6026f704d1c9
 SHA1 (patch-af) = 4ae54ce739ff41964fe56bc1b3e85611288a6e0c
-SHA1 (patch-ag) = 2a6a13c2878d28e476ec6ee747e7ca5d2e023468
-SHA1 (patch-fileio_c) = d0c01ae237bc5df0fd76d2362160d6946ef04846
+SHA1 (patch-ag) = fa8828a50faa835fa957de036af925dafd5584cb
--- a/cross/avrdude/patches/patch-ag
+++ b/cross/avrdude/patches/patch-ag
@@ -1,12 +1,12 @@
-$NetBSD: patch-ag,v 1.6 2013/12/06 07:27:15 mef Exp $
+$NetBSD: patch-ag,v 1.7 2014/10/07 15:10:29 mef Exp $

 Work around AVRISP mkII initial sync stalls on NetBSD.

--- usb_libusb.c.orig	2010-01-19 10:39:11.000000000 +0000
-+++ usb_libusb.c
-@@ -237,6 +237,17 @@ static void usbdev_close(union filedescr
- {
-   usb_dev_handle *udev = (usb_dev_handle *)fd->usb.handle;
+--- usb_libusb.c.orig	2014-03-13 08:03:19.000000000 +0900
+++ usb_libusb.c	2014-10-08 00:01:40.000000000 +0900
+@@ -324,6 +324,17 @@ static void usbdev_close(union filedescr
+   if (udev == NULL)
+     return;
 
 +#if defined(__NetBSD__)
 +#define USB_FEAT_ENDPOINT_HALT 0
@@ -21,4 +21,4 @@ Work around AVRISP mkII initial sync stalls on NetBSD.
 +
   (void)usb_release_interface(udev, usb_interface);
 
- #if !( defined(__FreeBSD__) ) // || ( defined(__APPLE__) && defined(__MACH__) ) )
+ #if defined(__linux__)
--- a/cross/avrdude/patches/patch-fileio_c
+++ b/cross/avrdude/patches/patch-fileio_c
@@ -1,24 +0,0 @@
-$NetBSD: patch-fileio_c,v 1.1 2013/12/06 07:27:15 mef Exp $
-
-To fix the warning:
-  fileio.c:957:3: warning: implicit declaration of function 'elf_getshdrstrndx'
-
-in libelf-0.8.13, elf_getshdrstrndx is declared in libelf/libelf.h, so
-that header file is to come first in if..elfif..endif clause.
-
--- fileio.c~	2013-10-06 18:37:49.000000000 +0900
-+++ fileio.c	2013-10-06 18:38:23.000000000 +0900
-@@ -29,10 +29,10 @@
- #include <stdint.h>
- 
- #ifdef HAVE_LIBELF
-#ifdef HAVE_LIBELF_H
-#include <libelf.h>
-#elif defined(HAVE_LIBELF_LIBELF_H)
-+#ifdef HAVE_LIBELF_LIBELF_H
- #include <libelf/libelf.h>
-+#elif defined(HAVE_LIBELF_H)
-+#include <libelf.h>
- #endif
- #define EM_AVR32 0x18ad         /* inofficial */
- #endif
--- a/cross/binutils-mips-current/DESCR
+++ b/cross/binutils-mips-current/DESCR
@@ -0,0 +1 @@
+A binutils-current snapshot suitable for NetBSD/playstation2
--- a/cross/binutils-mips-current/Makefile
+++ b/cross/binutils-mips-current/Makefile
@@ -0,0 +1,64 @@
+# $NetBSD: Makefile,v 1.5 2015/03/23 16:01:28 martin Exp $
+#
+# GNU binutils snapshot, configured to target MIPS (NetBSD/playstation2)
+
+BINUTILS_VER=		2.25
+
+DISTNAME=		binutils-${BINUTILS_VER}
+#PKGREVISION=		1
+PKGNAME=		binutils-mips-${BINUTILS_VER}
+CATEGORIES=		cross lang
+MASTER_SITES=		${MASTER_SITE_GNU:=binutils/}
+EXTRACT_SUFX=		.tar.bz2
+
+MAINTAINER=		martin@NetBSD.org
+HOMEPAGE=		http://www.gnu.org/
+COMMENT=		binutils for NetBSD/playstation2
+PLATFORM=		mipsel--netbsd
+LICENSE=		gnu-gpl-v3 AND gnu-lgpl-v3
+
+BUILDLINK_TRANSFORM+=	rm:-Werror
+
+USE_TOOLS+=		gm4 pod2man yacc gmake
+USE_LIBTOOL=		yes
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-64-bit-bfd
+CONFIGURE_ARGS+=	--target=${PLATFORM}
+
+MAKE_ARGS+=		CFLAGS="${CFLAGS}"
+
+PLIST_SUBST+=		LOCALBASE=${LOCALBASE:Q}
+
+BINDIR=			${PREFIX}/bin
+
+# Prevent the need to run texi2pod.pl and pod2man hence
+# the need for perl as build dependency.
+post-patch:
+.for _file_ in ld/ldver.texi ld/ld.1 gas/doc/gasver.texi gas/doc/as.1
+	if [ -f ${WRKSRC}/${_file_} ]; then				\
+		${TOUCH} ${WRKSRC}/${_file_};				\
+	fi
+.endfor
+	${RM} -rf ${WRKSRC}/etc
+
+# we use MKDIR, not INSTALL_PROGRAM_DIR, deliberately.
+do-install:
+	${MKDIR} -p ${DESTDIR}${BINDIR} ${DESTDIR}${PREFIX}/lib/ldscripts ${DESTDIR}${PREFIX}/include
+	libtool --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/binutils/addr2line ${DESTDIR}${BINDIR}/${PLATFORM}-addr2line
+	libtool --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/gas/as-new ${DESTDIR}${BINDIR}/${PLATFORM}-as
+	libtool --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/binutils/ar ${DESTDIR}${BINDIR}/${PLATFORM}-ar
+	libtool --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/binutils/cxxfilt ${DESTDIR}${BINDIR}/${PLATFORM}-cxxfilt
+	libtool --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/binutils/nm-new ${DESTDIR}${BINDIR}/${PLATFORM}-nm
+	libtool --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/binutils/objcopy ${DESTDIR}${BINDIR}/${PLATFORM}-objcopy
+	libtool --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/binutils/objdump ${DESTDIR}${BINDIR}/${PLATFORM}-objdump
+	libtool --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/binutils/ranlib ${DESTDIR}${BINDIR}/${PLATFORM}-ranlib
+	libtool --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/binutils/readelf ${DESTDIR}${BINDIR}/${PLATFORM}-readelf
+	libtool --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/binutils/size ${DESTDIR}${BINDIR}/${PLATFORM}-size
+	libtool --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/binutils/strings ${DESTDIR}${BINDIR}/${PLATFORM}-strings
+	libtool --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/binutils/strip-new ${DESTDIR}${BINDIR}/${PLATFORM}-strip
+	libtool --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/binutils/sysinfo ${DESTDIR}${BINDIR}/${PLATFORM}-sysinfo
+	libtool --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/ld/ld-new ${DESTDIR}${BINDIR}/${PLATFORM}-ld
+	for f in ${WRKSRC}/ld/ldscripts/*; do ${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/lib/ldscripts; done
+
+.include "../../mk/bsd.pkg.mk"
--- a/cross/binutils-mips-current/PLIST
+++ b/cross/binutils-mips-current/PLIST
@@ -0,0 +1,67 @@
+@comment $NetBSD: PLIST,v 1.3 2014/07/02 12:53:06 martin Exp $
+bin/mipsel--netbsd-addr2line
+bin/mipsel--netbsd-ar
+bin/mipsel--netbsd-as
+bin/mipsel--netbsd-cxxfilt
+bin/mipsel--netbsd-ld
+bin/mipsel--netbsd-nm
+bin/mipsel--netbsd-objcopy
+bin/mipsel--netbsd-objdump
+bin/mipsel--netbsd-ranlib
+bin/mipsel--netbsd-readelf
+bin/mipsel--netbsd-size
+bin/mipsel--netbsd-strings
+bin/mipsel--netbsd-strip
+bin/mipsel--netbsd-sysinfo
+lib/ldscripts/elf32btsmip.x
+lib/ldscripts/elf32btsmip.xbn
+lib/ldscripts/elf32btsmip.xc
+lib/ldscripts/elf32btsmip.xd
+lib/ldscripts/elf32btsmip.xdc
+lib/ldscripts/elf32btsmip.xdw
+lib/ldscripts/elf32btsmip.xn
+lib/ldscripts/elf32btsmip.xr
+lib/ldscripts/elf32btsmip.xs
+lib/ldscripts/elf32btsmip.xsc
+lib/ldscripts/elf32btsmip.xsw
+lib/ldscripts/elf32btsmip.xu
+lib/ldscripts/elf32btsmip.xw
+lib/ldscripts/elf32ltsmip.x
+lib/ldscripts/elf32ltsmip.xbn
+lib/ldscripts/elf32ltsmip.xc
+lib/ldscripts/elf32ltsmip.xd
+lib/ldscripts/elf32ltsmip.xdc
+lib/ldscripts/elf32ltsmip.xdw
+lib/ldscripts/elf32ltsmip.xn
+lib/ldscripts/elf32ltsmip.xr
+lib/ldscripts/elf32ltsmip.xs
+lib/ldscripts/elf32ltsmip.xsc
+lib/ldscripts/elf32ltsmip.xsw
+lib/ldscripts/elf32ltsmip.xu
+lib/ldscripts/elf32ltsmip.xw
+lib/ldscripts/elf64btsmip.x
+lib/ldscripts/elf64btsmip.xbn
+lib/ldscripts/elf64btsmip.xc
+lib/ldscripts/elf64btsmip.xd
+lib/ldscripts/elf64btsmip.xdc
+lib/ldscripts/elf64btsmip.xdw
+lib/ldscripts/elf64btsmip.xn
+lib/ldscripts/elf64btsmip.xr
+lib/ldscripts/elf64btsmip.xs
+lib/ldscripts/elf64btsmip.xsc
+lib/ldscripts/elf64btsmip.xsw
+lib/ldscripts/elf64btsmip.xu
+lib/ldscripts/elf64btsmip.xw
+lib/ldscripts/elf64ltsmip.x
+lib/ldscripts/elf64ltsmip.xbn
+lib/ldscripts/elf64ltsmip.xc
+lib/ldscripts/elf64ltsmip.xd
+lib/ldscripts/elf64ltsmip.xdc
+lib/ldscripts/elf64ltsmip.xdw
+lib/ldscripts/elf64ltsmip.xn
+lib/ldscripts/elf64ltsmip.xr
+lib/ldscripts/elf64ltsmip.xs
+lib/ldscripts/elf64ltsmip.xsc
+lib/ldscripts/elf64ltsmip.xsw
+lib/ldscripts/elf64ltsmip.xu
+lib/ldscripts/elf64ltsmip.xw
--- a/cross/binutils-mips-current/buildlink3.mk
+++ b/cross/binutils-mips-current/buildlink3.mk
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.1 2014/03/31 09:46:57 martin Exp $
+
+BUILDLINK_TREE+=	binutils-mips
+
+.if !defined(CROSS_BINUTILS_BUILDLINK3_MK)
+CROSS_BINUTILS_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.binutils-mips+=	binutils-mips>=2.23.91.0
+BUILDLINK_PKGSRCDIR.binutils-mips?=	../../cross/binutils-mips-current
+.endif # CROSS_BINUTILS_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-binutils-mips
--- a/cross/binutils-mips-current/distinfo
+++ b/cross/binutils-mips-current/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.4 2015/03/23 16:01:28 martin Exp $
+
+SHA1 (binutils-2.25.tar.bz2) = b46cc90ebaba7ffcf6c6d996d60738881b14e50d
+RMD160 (binutils-2.25.tar.bz2) = af6f54aa304d4840e1b1a3bd8a4cd165b30f9c1e
+Size (binutils-2.25.tar.bz2) = 24049133 bytes
+SHA1 (patch-bfd_config.bfd) = 9ab3424e681a6fcfddd9e9f72b5ff97c01ffd02c
+SHA1 (patch-gas_configure) = e2aacabce3b0aeb9656f0eb3e53b8c723935069c
--- a/cross/binutils-mips-current/hacks.mk
+++ b/cross/binutils-mips-current/hacks.mk
@@ -0,0 +1,15 @@
+# $NetBSD: hacks.mk,v 1.1 2014/04/02 12:49:25 obache Exp $
+
+.if !defined(BINUTILS_MIPS_CURRENT_HACKS_MK)
+BINUTILS_MIPS_CURRENT_HACKS_MK=	# defined
+
+#
+# Hit a bug of /bin/sh in NetBSD-6 release or prior.
+# PR pkg/48695
+#
+.if !empty(MACHINE_PLATFORM:MNetBSD-[0-6].*-*) \
+	&& empty(MACHINE_PLATFORM:MNetBSD-6.99-*-*)
+CONFIG_SHELL=	/bin/ksh
+.endif
+
+.endif	# BINUTILS_MIPS_CURRENT_HACKS_MK
--- a/cross/binutils-mips-current/patches/patch-bfd_config.bfd
+++ b/cross/binutils-mips-current/patches/patch-bfd_config.bfd
@@ -0,0 +1,15 @@
+$NetBSD: patch-bfd_config.bfd,v 1.2 2015/03/23 16:01:28 martin Exp $
+
+Add support for a few missing abi variants
+
+--- bfd/config.bfd.orig	2014-10-14 09:32:02.000000000 +0200
+++ bfd/config.bfd	2015-03-23 14:42:17.000000000 +0100
+@@ -969,7 +969,7 @@
+ #ifdef BFD64
+   mips*el-*-netbsd*)
+     targ_defvec=mips_elf32_trad_le_vec
+-    targ_selvecs="mips_elf32_trad_be_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec mips_ecoff_le_vec mips_ecoff_be_vec"
+    targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_ntrad_be_vec mips_elf32_trad_be_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec mips_ecoff_le_vec mips_ecoff_be_vec"
+     ;;
+   mips*-*-netbsd*)
+     targ_defvec=mips_elf32_trad_be_vec
--- a/cross/binutils-mips-current/patches/patch-gas_configure
+++ b/cross/binutils-mips-current/patches/patch-gas_configure
@@ -0,0 +1,51 @@
+$NetBSD: patch-gas_configure,v 1.1 2015/03/23 16:01:28 martin Exp $
+
+Portability fixes
+
+--- gas/configure.orig	2014-12-23 15:22:05.000000000 +0100
+++ gas/configure	2015-03-23 14:47:32.000000000 +0100
+@@ -12331,7 +12331,7 @@
+         # Decide features one by one.
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for default configuration of --enable-dx-regs" >&5
+ $as_echo_n "checking for default configuration of --enable-dx-regs... " >&6; }
+-	if test "x${enable_dx_regs}" == xyes; then
+	if test "x${enable_dx_regs}" = xyes; then
+ 
+ $as_echo "#define NDS32_DEFAULT_DX_REGS 1" >>confdefs.h
+ 
+@@ -12345,7 +12345,7 @@
+ 
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for default configuration of --enable-perf-ext" >&5
+ $as_echo_n "checking for default configuration of --enable-perf-ext... " >&6; }
+-	if test "x${enable_perf_ext}" == xno; then
+	if test "x${enable_perf_ext}" = xno; then
+ 
+ $as_echo "#define NDS32_DEFAULT_PERF_EXT 0" >>confdefs.h
+ 
+@@ -12359,7 +12359,7 @@
+ 
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for default configuration of --enable-perf-ext2" >&5
+ $as_echo_n "checking for default configuration of --enable-perf-ext2... " >&6; }
+-	if test "x${enable_perf_ext2}" == xno; then
+	if test "x${enable_perf_ext2}" = xno; then
+ 
+ $as_echo "#define NDS32_DEFAULT_PERF_EXT2 0" >>confdefs.h
+ 
+@@ -12373,7 +12373,7 @@
+ 
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for default configuration of --enable-string-ext" >&5
+ $as_echo_n "checking for default configuration of --enable-string-ext... " >&6; }
+-	if test "x${enable_string_ext}" == xno; then
+	if test "x${enable_string_ext}" = xno; then
+ 
+ $as_echo "#define NDS32_DEFAULT_STRING_EXT 0" >>confdefs.h
+ 
+@@ -12387,7 +12387,7 @@
+ 
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for default configuration of --enable-audio-ext" >&5
+ $as_echo_n "checking for default configuration of --enable-audio-ext... " >&6; }
+-	if test "x${enable_audio_ext}" == xno; then
+	if test "x${enable_audio_ext}" = xno; then
+ 
+ $as_echo "#define NDS32_DEFAULT_AUDIO_EXT 0" >>confdefs.h
+ 
--- a/cross/bossa/Makefile
+++ b/cross/bossa/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2014/02/18 15:01:09 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2014/12/10 23:20:20 joerg Exp $

 PKGNAME=	bossa-20140109
 DISTNAME=	b-o-s-s-a-code-05bfcc39bc0453c3028b1161175b95a81af7a901
+PKGREVISION=	1
 CATEGORIES=	comms
 EXTRACT_SUFX=	.zip

@@ -12,6 +13,10 @@ LICENSE=	gnu-gpl-v3

 INSTALLATION_DIRS=      bin

+LDFLAGS+=	${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.readline}/lib \
+		-L${BUILDLINK_PREFIX.readline}/lib
+ALL_ENV+=	COMMON_LDFLAGS=${LDFLAGS:Q}
+
 post-patch:
 	${CP} files/NetBSD* ${WRKSRC}/src/

@@ -24,7 +29,7 @@ USE_TOOLS=	gmake

 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
-CXXFLAGS+=	-Wno-error=tautological-compare
+CXXFLAGS+=	-Wno-error=tautological-compare -Wno-error=unused-local-typedef
 .endif

 .include "../../devel/readline/buildlink3.mk"
--- a/cross/cc65/Makefile
+++ b/cross/cc65/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2013/05/31 12:39:46 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2014/05/29 23:35:24 wiz Exp $
 #

 DISTNAME=	cc65-sources-2.13.3
 PKGNAME=	${DISTNAME:S/-sources//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	cross lang
 MASTER_SITES=	ftp://ftp.musoftware.de/pub/uz/cc65/
 EXTRACT_SUFX=	.tar.bz2
--- a/cross/dasm/Makefile
+++ b/cross/dasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/06/16 09:40:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2014/10/09 14:06:04 wiz Exp $
 #

 DISTNAME=	dasm-2.20.11
@@ -10,8 +10,6 @@ HOMEPAGE=	http://dasm-dillon.sourceforge.net/
 COMMENT=	Multi-CPU cross-assembler for 6502, 6803 and 68HC11
 LICENSE=	gnu-gpl-v2

-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 NO_CONFIGURE=	YES
 USE_TOOLS+=	gmake

--- a/cross/freemint-binutils/Makefile
+++ b/cross/freemint-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/01/19 07:23:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.3 2014/10/30 21:54:03 mef Exp $

 DISTNAME=	binutils-2.24
 PKGNAME=	cross-freemint-${DISTNAME}
@@ -30,6 +30,15 @@ INFO_FILES=		yes

 INSTALLATION_DIRS+=	bin ${FREEMINT_PREFIX}

+# follows to devel/binutils
+# PR pkg/48504, ksh is sufficient for NetBSD 5.2 and NetBSD 6.1
+.include "../../mk/bsd.prefs.mk"
+.if !empty(MACHINE_PLATFORM:MNetBSD-[5-6].*-*) && \
+	empty(MACHINE_PLATFORM:MNetBSD-6.99.*-*)
+USE_TOOLS+=		ksh
+CONFIG_SHELL=		ksh
+.endif
+
 pre-configure:
 	${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
 	${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}
--- a/cross/freemint-gcc/Makefile
+++ b/cross/freemint-gcc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2013/11/24 04:41:41 ryoon Exp $
+# $NetBSD: Makefile,v 1.3 2014/05/16 13:54:50 ryoon Exp $

 DISTNAME=		gcc-4.6.4
 PKGNAME=		cross-freemint-${DISTNAME}
+PKGREVISION=		1
 CATEGORIES=		cross
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/gcc-4.6.4/}

@@ -62,12 +63,12 @@ pre-configure:
 	${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/${DISTNAME}

 post-install:
-	for f in h8300-elf-cpp    h8300-elf-gcc \
-		 h8300-elf-c++    h8300-elf-g++ \
-		 h8300-elf-gccbug h8300-elf-gcov \
+	for f in cpp    gcc \
+		 c++    g++ \
+		 gcov \
 		 ; do \
-		${LN} -sf ../cross-h8300-elf/bin/"$$f" \
-			${DESTDIR}${PREFIX}/bin/"$$f" || exit 1; \
+		${LN} -sf ../cross-atari-mint/bin/"m68k-atari-mint-$$f" \
+			${DESTDIR}${PREFIX}/bin/"m68k-atari-mint-$$f" || exit 1; \
 	done

 .include "../../cross/freemint-mintlib/buildlink3.mk"
--- a/cross/freemint-gcc/PLIST
+++ b/cross/freemint-gcc/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2013/09/12 14:07:18 ryoon Exp $
-bin/h8300-elf-c++
-bin/h8300-elf-cpp
-bin/h8300-elf-g++
-bin/h8300-elf-gcc
-bin/h8300-elf-gccbug
-bin/h8300-elf-gcov
+@comment $NetBSD: PLIST,v 1.2 2014/05/16 13:54:50 ryoon Exp $
+bin/m68k-atari-mint-c++
+bin/m68k-atari-mint-cpp
+bin/m68k-atari-mint-g++
+bin/m68k-atari-mint-gcc
+bin/m68k-atari-mint-gcov
 cross-freemint/bin/m68k-atari-mint-c++
 cross-freemint/bin/m68k-atari-mint-cpp
 cross-freemint/bin/m68k-atari-mint-g++
--- a/cross/freemint-mintlib/Makefile
+++ b/cross/freemint-mintlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/01/19 07:43:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2015/01/16 23:53:04 wiedi Exp $

 DISTNAME=		mintlib-CVS-20131219
 PKGNAME=		cross-freemint-${DISTNAME:S/CVS-//}
@@ -28,7 +28,7 @@ FREEMINT_PREFIX=	${PREFIX}/cross-freemint
 CONFIGURE_DIRS=		${GCCNAME}bin
 CONFIGURE_SCRIPT=	../${GCCNAME}/configure

-USE_TOOLS+=		bash:run gmake makeinfo bison
+USE_TOOLS+=		bash:run gmake makeinfo bison flex
 GNU_CONFIGURE=		yes

 GNU_CONFIGURE_PREFIX=	${FREEMINT_PREFIX}
--- a/cross/gcc-mips-current/DESCR
+++ b/cross/gcc-mips-current/DESCR
@@ -0,0 +1 @@
+A gcc-current snapshot suitable to build kernels for NetBSD/playstation2.
--- a/cross/gcc-mips-current/Makefile
+++ b/cross/gcc-mips-current/Makefile
@@ -0,0 +1,122 @@
+# $NetBSD: Makefile,v 1.7 2015/03/23 16:02:09 martin Exp $
+
+GCC_DIST_VERSION=4.9.2
+GCC_PKGNAME=	gcc-mips-${GCC_DIST_VERSION}
+
+DISTNAME=	gcc-${GCC_DIST_VERSION}
+PKGNAME=	${GCC_PKGNAME}
+#PKGREVISION=	1
+CATEGORIES=	cross lang
+MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC_DIST_VERSION}/}
+EXTRACT_SUFX=	.tar.bz2
+PLIST_SUBST+=	GCC_DIST_VERSION=${GCC_DIST_VERSION:Q}
+
+MAINTAINER=	martin@NetBSD.org
+HOMEPAGE=	http://gcc.gnu.org/
+COMMENT=	The GNU Compiler Collection (GCC) - 4.9 for mips (especially playstation2)
+LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
+
+DISTFILES=		${DEFAULT_DISTFILES}
+EXTRACT_ONLY=		${DEFAULT_DISTFILES}
+
+NOT_FOR_PLATFORM=	Interix-*-*
+
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake makeinfo sed:run perl
+GNU_CONFIGURE=		yes
+## Build outside ${WRKSRC}
+OBJDIR=			../build
+CONFIGURE_DIRS=		${OBJDIR}
+CONFIGURE_SCRIPT=	../${DISTNAME}/configure
+INFO_FILES=		yes
+
+UNLIMIT_RESOURCES+=	datasize
+UNLIMIT_RESOURCES+=	stacksize
+
+SUBST_CLASSES+=		vars
+SUBST_MESSAGE.vars=	Setting target machine name path in ${SUBST_FILES.vars}
+SUBST_STAGE.vars=	pre-configure
+SUBST_FILES.vars=	gcc/Makefile.in
+SUBST_VARS.vars=	GCC_TARGET_MACHINE
+
+.include "../../mk/bsd.prefs.mk"
+
+LANGS=			c c++
+
+# In some cases LINKER_RPATH_FLAG needs a trailing space.
+LINKER_RPATH_FLAG:=	${LINKER_RPATH_FLAG:S/-rpath/& /}
+
+## The Library rpath to use in end programs.
+LDFLAGS_FOR_TARGET=	${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*}
+
+# GCC does not understand this option; remove it, or stage build will fail
+BUILDLINK_TRANSFORM+=	rm:-stdlib=libc++
+
+## For target librarys and libjava programs.
+CONFIGURE_ENV+=		LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q}
+
+# Make sure the target binutils are both in PATH and supplied explicitly
+# to configure
+.for prg in as ar ld nm strip objcopy objdump ranlib readelf
+# CONFIGURE_ENV+=		${prg:tu}_FOR_TARGET=${PREFIX}/bin/${TARGET}-${prg}
+CONFIGURE_ARGS+=	--with-${prg}=${PREFIX}/bin/${TARGET}-${prg}
+.endfor
+
+CONFIGURE_ARGS+=	--disable-nls
+CONFIGURE_ARGS+=	--disable-libquadmath
+CONFIGURE_ARGS+=	--disable-libquadmath-support 
+CONFIGURE_ARGS+=	--disable-libssp
+CONFIGURE_ARGS+=	--disable-libgomp
+CONFIGURE_ARGS+=	--disable-libstdc++-v3
+CONFIGURE_ARGS+=	--disable-libatomic
+CONFIGURE_ARGS+=	--disable-libgcc
+CONFIGURE_ARGS+=	--enable-languages=${LANGS:Q}
+CONFIGURE_ARGS+=	--enable-shared
+CONFIGURE_ARGS+=	--enable-long-long
+CONFIGURE_ARGS+=	--with-local-prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=	--enable-threads=posix
+CONFIGURE_ARGS+=	--with-boot-ldflags=${BOOT_LDFLAGS:Q}
+.if ${OPSYS} == "NetBSD"
+MAKE_ENV+=		ac_cv_func_clock_gettime=yes
+.endif
+.if ${OPSYS} == "DragonFly"
+CONFIGURE_ARGS+=	--disable-bootstrap
+.endif
+
+TARGET=			mipsel--netbsd
+CONFIGURE_ARGS+=	--target=${TARGET}
+
+# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
+# a binary so we need to make sure we give it the installed sed and not
+# the tool wrapped one.
+MAKE_ENV+=		ac_cv_path_SED=${TOOLS_SED}
+MAKE_ENV+=		lt_cv_path_SED=${TOOLS_SED}
+
+pre-configure:
+	${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
+
+TEST_TARGET=	-k check || ${TRUE}
+pre-test:
+	${RUN} 							\
+	if runtest --version >/dev/null 2>/dev/null ; then	\
+		: ;						\
+	else							\
+	  ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \
+	  exit 1 ;						\
+	fi
+post-test:
+	${RUN} cd ${WRKSRC} && cd ${OBJDIR} &&		\
+	${SHELL} ${WRKSRC}/contrib/test_summary >${WRKDIR}/test_summary.log
+	@${INFO_MSG} "Test summary are available in ${WRKDIR}/test_summary.log"
+
+CONFIGURE_ARGS+=	--with-gmp=${BUILDLINK_PREFIX.gmp}
+CONFIGURE_ARGS+=	--with-mpc=${BUILDLINK_PREFIX.mpcomplex}
+CONFIGURE_ARGS+=	--with-mpfr=${BUILDLINK_PREFIX.mpfr}
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../math/mpcomplex/buildlink3.mk"
+.include "../../math/mpfr/buildlink3.mk"
+
+.include "../../cross/binutils-mips-current/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/cross/gcc-mips-current/PLIST
+++ b/cross/gcc-mips-current/PLIST
@@ -0,0 +1,255 @@
+@comment $NetBSD: PLIST,v 1.4 2015/03/23 16:02:09 martin Exp $
+bin/mipsel--netbsd-c++
+bin/mipsel--netbsd-cpp
+bin/mipsel--netbsd-g++
+bin/mipsel--netbsd-gcc
+bin/mipsel--netbsd-gcc-${GCC_DIST_VERSION}
+bin/mipsel--netbsd-gcc-ar
+bin/mipsel--netbsd-gcc-nm
+bin/mipsel--netbsd-gcc-ranlib
+bin/mipsel--netbsd-gcov
+info/cpp.info
+info/cppinternals.info
+info/gcc.info
+info/gccinstall.info
+info/gccint.info
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/include-fixed/README
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/include-fixed/limits.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/include-fixed/syslimits.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/include/float.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/include/iso646.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/include/loongson.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/include/stdalign.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/include/stdarg.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/include/stdatomic.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/include/stdbool.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/include/stddef.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/include/stdfix.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/include/stdnoreturn.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/include/tgmath.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/include/varargs.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/install-tools/fixinc_list
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/install-tools/gsyslimits.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/install-tools/include/README
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/install-tools/include/limits.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/install-tools/macro_list
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/install-tools/mkheaders.conf
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/gtype.state
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/ada/gcc-interface/ada-tree.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/alias.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/all-tree.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/alloc-pool.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/ansidecl.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/attribs.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/auto-host.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/b-header-vars
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/basic-block.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/bitmap.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/builtins.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/bversion.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/c-family/c-common.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/c-family/c-common.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/c-family/c-objc.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/c-family/c-pragma.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/c-family/c-pretty-print.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/c-tree.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/calls.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/cfg-flags.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/cfgexpand.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/cfghooks.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/cfgloop.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/cgraph.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/cif-code.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/cilk-builtins.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/cilkplus.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/config.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/config/elfos.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/config/initfini-array.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/config/mips/elf.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/config/mips/mips-opts.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/config/mips/mips-protos.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/config/mips/mips.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/config/mips/netbsd.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/config/netbsd-elf.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/config/netbsd.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/config/vxworks-dummy.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/configargs.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/context.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/coretypes.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/cp/cp-tree.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/cp/cp-tree.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/cp/cxx-pretty-print.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/cp/name-lookup.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/cp/type-utils.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/cppdefault.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/cpplib.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/debug.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/defaults.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/df.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/diagnostic-color.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/diagnostic-core.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/diagnostic.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/diagnostic.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/double-int.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/dumpfile.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/emit-rtl.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/except.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/filenames.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/fixed-value.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/flag-types.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/flags.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/fold-const.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/function.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/gcc-plugin.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/gcc-symtab.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/genrtl.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/ggc.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/gimple-builder.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/gimple-expr.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/gimple-fold.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/gimple-iterator.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/gimple-low.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/gimple-pretty-print.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/gimple-ssa.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/gimple-walk.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/gimple.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/gimple.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/gimplify-me.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/gimplify.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/gsstruct.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/gtm-builtins.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/gtype-desc.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/hard-reg-set.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/hash-table.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/hashtab.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/highlev-plugin-common.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/hwint.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/incpath.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/input.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/insn-codes.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/insn-constants.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/insn-flags.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/insn-modes.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/insn-notes.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/internal-fn.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/internal-fn.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/intl.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/ipa-prop.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/ipa-ref-inline.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/ipa-ref.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/ipa-reference.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/ipa-utils.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/is-a.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/java/java-tree.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/langhooks.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/libiberty.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/line-map.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/machmode.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/md5.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/mode-classes.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/objc/objc-tree.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/obstack.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/omp-builtins.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/options.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/opts.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/output.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/params.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/params.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/pass-instances.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/pass_manager.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/plugin-api.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/plugin-version.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/plugin.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/plugin.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/pointer-set.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/predict.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/predict.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/prefix.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/pretty-print.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/print-rtl.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/print-tree.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/real.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/realmpfr.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/reg-notes.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/regset.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/resource.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/rtl.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/rtl.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/safe-ctype.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/sanitizer.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/sbitmap.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/splay-tree.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/ssa-iterators.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/statistics.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/stmt.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/stor-layout.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/stringpool.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/symtab.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/sync-builtins.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/system.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/target-hooks-macros.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/target.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/target.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/timevar.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/timevar.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tm-preds.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tm.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tm_p.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/toplev.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-cfg.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-cfgcleanup.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-check.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-core.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-dfa.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-dump.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-eh.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-hasher.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-inline.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-into-ssa.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-iterator.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-nested.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-object-size.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-outof-ssa.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-parloops.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-pass.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-phinodes.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-pretty-print.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-ssa-address.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-ssa-alias.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-ssa-coalesce.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-ssa-dom.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-ssa-loop-ivopts.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-ssa-loop-manip.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-ssa-loop-niter.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-ssa-loop.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-ssa-operands.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-ssa-sccvn.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-ssa-ter.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-ssa-threadedge.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-ssa-threadupdate.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-ssa.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree-ssanames.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/tree.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/treestruct.def
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/varasm.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/vec.h
+lib/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/include/version.h
+libexec/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/cc1
+libexec/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/cc1plus
+libexec/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/collect2
+libexec/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/install-tools/fixinc.sh
+libexec/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/install-tools/fixincl
+libexec/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/install-tools/mkheaders
+libexec/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/install-tools/mkinstalldirs
+libexec/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/liblto_plugin.la
+libexec/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/lto-wrapper
+libexec/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/lto1
+libexec/gcc/mipsel--netbsd/${GCC_DIST_VERSION}/plugin/gengtype
+man/man1/mipsel--netbsd-cpp.1
+man/man1/mipsel--netbsd-g++.1
+man/man1/mipsel--netbsd-gcc.1
+man/man1/mipsel--netbsd-gcov.1
+man/man7/fsf-funding.7
+man/man7/gfdl.7
+man/man7/gpl.7
--- a/cross/gcc-mips-current/distinfo
+++ b/cross/gcc-mips-current/distinfo
@@ -0,0 +1,12 @@
+$NetBSD: distinfo,v 1.5 2015/03/23 16:02:09 martin Exp $
+
+SHA1 (gcc-4.9.2.tar.bz2) = 79dbcb09f44232822460d80b033c962c0237c6d8
+RMD160 (gcc-4.9.2.tar.bz2) = bc6454e7c67c6f5fd2c98cdd1364ebb1739e1347
+Size (gcc-4.9.2.tar.bz2) = 89939747 bytes
+SHA1 (patch-gcc_config.host) = 1b1e11cd199eb93f49443d51c0063b09b7327858
+SHA1 (patch-gcc_config_host-netbsd.c) = 8f13b09dd7006d456cd1c66e895be504e9537880
+SHA1 (patch-gcc_config_mips_netbsd.h) = 094c373421eca14076e55df65aed66e722582ddd
+SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3
+SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783
+SHA1 (patch-libgcc_config.host) = 353f4d17581d619bb4fd55ad27ab4576f28023b7
+SHA1 (patch-libgcc_config_t-hardfp) = e6341eb19fedcbe63bbfbc8a234ddf3e52ca9866
--- a/cross/gcc-mips-current/patches/patch-gcc_config.host
+++ b/cross/gcc-mips-current/patches/patch-gcc_config.host
@@ -0,0 +1,18 @@
+$NetBSD: patch-gcc_config.host,v 1.1 2014/03/31 09:49:32 martin Exp $
+
+Add host hooks for NetBSD - needed for working precompiled headers.
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58397
+
+--- gcc/config.host.orig	2013-01-10 21:38:27.000000000 +0100
+++ gcc/config.host	2013-09-10 20:25:36.000000000 +0200
+@@ -271,6 +271,10 @@
+     out_host_hook_obj=host-openbsd.o
+     host_xmake_file="${host_xmake_file} x-openbsd"
+     ;;
+  *-*-netbsd*)
+    out_host_hook_obj=host-netbsd.o
+    host_xmake_file="${host_xmake_file} x-netbsd"
+    ;;
+   ia64-*-hpux*)
+     use_long_long_for_widest_fast_int=yes
+     out_host_hook_obj=host-hpux.o
--- a/cross/gcc-mips-current/patches/patch-gcc_config_host-netbsd.c
+++ b/cross/gcc-mips-current/patches/patch-gcc_config_host-netbsd.c
@@ -0,0 +1,93 @@
+$NetBSD: patch-gcc_config_host-netbsd.c,v 1.1 2014/03/31 09:49:32 martin Exp $
+
+Add host hooks for NetBSD - needed for working precompiled headers.
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58397
+
+--- /dev/null	2013-09-11 20:06:51.000000000 +0200
+++ gcc/config/host-netbsd.c	2013-09-11 20:29:31.000000000 +0200
+@@ -0,0 +1,85 @@
+/* NetBSD host-specific hook definitions.
+   Copyright (C) 2004-2013 Free Software Foundation, Inc.
+
+   This file is part of GCC.
+
+   GCC is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3, or (at your
+   option) any later version.
+
+   GCC is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GCC; see the file COPYING3.  If not see
+   <http://www.gnu.org/licenses/>.  */
+
+#include "config.h"
+#include "system.h"
+#include "coretypes.h"
+#include "hosthooks.h"
+#include "hosthooks-def.h"
+
+
+#undef HOST_HOOKS_GT_PCH_GET_ADDRESS
+#define HOST_HOOKS_GT_PCH_GET_ADDRESS netbsd_gt_pch_get_address
+#undef HOST_HOOKS_GT_PCH_USE_ADDRESS
+#define HOST_HOOKS_GT_PCH_USE_ADDRESS netbsd_gt_pch_use_address
+
+/* For various ports, try to guess a fixed spot in the vm space
+   that's probably free.  */
+#if defined(__sparc64__)
+# define TRY_EMPTY_VM_SPACE	0x40000000000
+#elif defined(_LP64)
+# define TRY_EMPTY_VM_SPACE	0x400000000000
+#elif defined(__mips__) || defined(__vax__)
+# define TRY_EMPTY_VM_SPACE	0x60000000
+#else
+# define TRY_EMPTY_VM_SPACE	0xb0000000
+#endif
+
+/* Determine a location where we might be able to reliably allocate
+   SIZE bytes.  FD is the PCH file, though we should return with the
+   file unmapped.  */
+
+static void *
+netbsd_gt_pch_get_address (size_t size, int fd)
+{
+  void *addr;
+
+  addr = mmap ((void *) TRY_EMPTY_VM_SPACE, size, PROT_READ | PROT_WRITE,
+	       MAP_PRIVATE | MAP_FIXED, fd, 0);
+
+  /* If we failed the map, that means there's *no* free space.  */
+  if (addr == (void *) MAP_FAILED)
+    return NULL;
+  /* Unmap the area before returning.  */
+  munmap (addr, size);
+
+  return addr;
+}
+
+/* Map SIZE bytes of FD+OFFSET at BASE.  Return 1 if we succeeded at 
+   mapping the data at BASE, -1 if we couldn't.  */
+
+static int
+netbsd_gt_pch_use_address (void *base, size_t size, int fd, size_t offset)
+{
+  void *addr;
+
+  /* We're called with size == 0 if we're not planning to load a PCH
+     file at all.  This allows the hook to free any static space that
+     we might have allocated at link time.  */
+  if (size == 0)
+    return -1;
+
+  addr = mmap (base, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED, fd, offset);
+
+  return addr == base ? 1 : -1;
+}
+
+
+const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER;
--- a/cross/gcc-mips-current/patches/patch-gcc_config_mips_netbsd.h
+++ b/cross/gcc-mips-current/patches/patch-gcc_config_mips_netbsd.h
@@ -0,0 +1,126 @@
+$NetBSD: patch-gcc_config_mips_netbsd.h,v 1.3 2014/07/05 09:03:49 martin Exp $
+
+Use same types, pre-defines and link specs as the in-tree compiler.
+
+--- gcc/config/mips/netbsd.h.orig	2014-04-01 12:40:57.000000000 +0200
+++ gcc/config/mips/netbsd.h	2014-07-05 10:37:40.000000000 +0200
+@@ -32,18 +32,63 @@
+       if (TARGET_ABICALLS)				\
+ 	builtin_define ("__ABICALLS__");		\
+ 							\
+-      if (mips_abi == ABI_32)				\
+-	builtin_define ("__mips_o32");			\
+-      else if (mips_abi == ABI_EABI)			\
+-	builtin_define ("__mips_eabi");			\
+-      else if (mips_abi == ABI_N32)			\
+    /* The GNU C++ standard library requires this.  */		\
+    if (c_dialect_cxx ())					\
+      builtin_define ("_GNU_SOURCE");				\
+    								\
+    if (mips_abi == ABI_N32)					\
+      {								\
+ 	builtin_define ("__mips_n32");			\
+        builtin_define ("_ABIN32=2");				\
+        builtin_define ("_MIPS_SIM=_ABIN32");			\
+        builtin_define ("_MIPS_SZLONG=32");			\
+        builtin_define ("_MIPS_SZPTR=32");			\
+      }								\
+       else if (mips_abi == ABI_64)			\
+      {								\
+ 	builtin_define ("__mips_n64");			\
+        builtin_define ("_ABI64=3");				\
+        builtin_define ("_MIPS_SIM=_ABI64");			\
+        builtin_define ("_MIPS_SZLONG=64");			\
+        builtin_define ("_MIPS_SZPTR=64");			\
+      }								\
+       else if (mips_abi == ABI_O64)			\
+      {								\
+ 	builtin_define ("__mips_o64");			\
+        builtin_define ("_ABIO64=4");				\
+        builtin_define ("_MIPS_SIM=_ABIO64");			\
+        builtin_define ("_MIPS_SZLONG=64");			\
+        builtin_define ("_MIPS_SZPTR=64");			\
+     }							\
+-  while (0)
+    else if (mips_abi == ABI_EABI)				\
+      {								\
+	builtin_define ("__mips_eabi");				\
+        builtin_define ("_ABIEMB=5");				\
+        builtin_define ("_MIPS_SIM=_ABIEMB");			\
+	if (TARGET_LONG64)					\
+          builtin_define ("_MIPS_SZLONG=64");			\
+	else							\
+          builtin_define ("_MIPS_SZLONG=32");			\
+	if (TARGET_64BIT)					\
+          builtin_define ("_MIPS_SZPTR=64");			\
+	else							\
+          builtin_define ("_MIPS_SZPTR=32");			\
+      }								\
+    else							\
+      {								\
+	builtin_define ("__mips_o32");				\
+	builtin_define ("_ABIO32=1");				\
+	builtin_define ("_MIPS_SIM=_ABIO32");			\
+        builtin_define ("_MIPS_SZLONG=32");			\
+        builtin_define ("_MIPS_SZPTR=32");			\
+      }								\
+    if (TARGET_FLOAT64)						\
+      builtin_define ("_MIPS_FPSET=32");			\
+    else							\
+      builtin_define ("_MIPS_FPSET=16");			\
+    								\
+    builtin_define ("_MIPS_SZINT=32");				\
+  } while (0)
+ 
+ /* The generic MIPS TARGET_CPU_CPP_BUILTINS are incorrect for NetBSD.
+    Specifically, they define too many namespace-invasive macros.  Override
+@@ -99,6 +144,11 @@
+ 	  builtin_define ("__mips=64");				\
+ 	  builtin_define ("__mips_isa_rev=1");			\
+ 	}							\
+      else if (ISA_MIPS64R2)					\
+	{							\
+	  builtin_define ("__mips=64");				\
+	  builtin_define ("__mips_isa_rev=2");			\
+	}							\
+ 								\
+       if (TARGET_HARD_FLOAT)					\
+ 	builtin_define ("__mips_hard_float");			\
+@@ -138,10 +188,12 @@
+ 
+ #undef LINK_SPEC
+ #define LINK_SPEC \
+-  "%{EL:-m elf32lmip} \
+-   %{EB:-m elf32bmip} \
+  "%{EL:-m elf32ltsmip} \
+   %{EB:-m elf32btsmip} \
+    %(endian_spec) \
+-   %{G*} %{mips1} %{mips2} %{mips3} %{mips4} %{mips32} %{mips32r2} %{mips64} \
+   %{G*} %{mips1} %{mips2} %{mips3} %{mips4} \
+   %{mips32} %{mips32r2} %{mips64} %{mips64r2} \
+   %{bestGnum} %{call_shared} %{no_archive} %{exact_version} \
+    %(netbsd_link_spec)"
+ 
+ #define NETBSD_ENTRY_POINT "__start"
+@@ -171,6 +223,14 @@
+ 
+ /* Make gcc agree with <machine/ansi.h> */
+ 
+#undef SIZE_TYPE
+#define SIZE_TYPE ((POINTER_SIZE == 64 || TARGET_NEWABI) \
+		   ? "long unsigned int" : "unsigned int")
+
+#undef PTRDIFF_TYPE
+#define PTRDIFF_TYPE ((POINTER_SIZE == 64 || TARGET_NEWABI) \
+		      ? "long int" : "int")
+
+ #undef WCHAR_TYPE
+ #define WCHAR_TYPE "int"
+ 
+@@ -179,3 +239,6 @@
+ 
+ #undef WINT_TYPE
+ #define WINT_TYPE "int"
+
+#undef TARGET_WRITABLE_EH_FRAME
+#define TARGET_WRITABLE_EH_FRAME (flag_pic && TARGET_SHARED)
--- a/cross/gcc-mips-current/patches/patch-gcc_config_x-netbsd
+++ b/cross/gcc-mips-current/patches/patch-gcc_config_x-netbsd
@@ -0,0 +1,12 @@
+$NetBSD: patch-gcc_config_x-netbsd,v 1.1 2014/03/31 09:49:32 martin Exp $
+
+Add host hooks for NetBSD - needed for working precompiled headers.
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58397
+
+--- /dev/null	2013-09-11 09:12:57.000000000 +0200
+++ gcc/config/x-netbsd	2013-09-10 18:57:27.000000000 +0200
+@@ -0,0 +1,4 @@
+host-netbsd.o : $(srcdir)/config/host-netbsd.c $(CONFIG_H) $(SYSTEM_H) \
+  coretypes.h hosthooks.h hosthooks-def.h $(HOOKS_H)
+	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+		$(srcdir)/config/host-netbsd.c
--- a/cross/gcc-mips-current/patches/patch-gcc_system.h
+++ b/cross/gcc-mips-current/patches/patch-gcc_system.h
@@ -0,0 +1,27 @@
+$NetBSD: patch-gcc_system.h,v 1.1 2014/05/27 09:53:37 joerg Exp $
+
+--- gcc/system.h.orig	2013-04-29 18:37:29.000000000 +0000
+++ gcc/system.h
+@@ -72,18 +72,22 @@ along with GCC; see the file COPYING3.  
+ 
+ #if defined HAVE_DECL_PUTC_UNLOCKED && HAVE_DECL_PUTC_UNLOCKED
+ 
+# if !defined(__NetBSD__)
+ # ifdef HAVE_PUTC_UNLOCKED
+ #  undef putc
+ #  define putc(C, Stream) putc_unlocked (C, Stream)
+ # endif
+# endif
+ # ifdef HAVE_PUTCHAR_UNLOCKED
+ #  undef putchar
+ #  define putchar(C) putchar_unlocked (C)
+ # endif
+# if !defined(__NetBSD__)
+ # ifdef HAVE_GETC_UNLOCKED
+ #  undef getc
+ #  define getc(Stream) getc_unlocked (Stream)
+ # endif
+# endif
+ # ifdef HAVE_GETCHAR_UNLOCKED
+ #  undef getchar
+ #  define getchar() getchar_unlocked ()
--- a/cross/gcc-mips-current/patches/patch-libgcc_config.host
+++ b/cross/gcc-mips-current/patches/patch-libgcc_config.host
@@ -0,0 +1,25 @@
+$NetBSD: patch-libgcc_config.host,v 1.1 2014/03/31 09:49:32 martin Exp $
+
+don't force libgcc_so.so to depend upon libc being present, and
+build the gcc crtstuff (for this cross-compiler only)
+
+--- libgcc/config.host.orig	2014-03-06 04:24:11.000000000 -0800
+++ libgcc/config.host	2014-03-23 17:46:43.000000000 -0700
+@@ -239,14 +239,8 @@
+   ;;
+ *-*-netbsd*)
+   tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver"
+-  # NetBSD 1.7 and later are set up to use GCC's crtstuff for
+-  # ELF configurations.  We will clear extra_parts in the
+-  # a.out configurations.
+-  case ${host} in
+-    *-*-netbsd*1.[7-9]* | *-*-netbsd[2-9]* | *-*-netbsdelf[2-9]*)
+-      extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
+-      ;;
+-  esac
+  tmake_file="${tmake_file} t-slibgcc-nolc-override"
+  extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
+   ;;
+ *-*-openbsd*)
+   tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip"
+
--- a/cross/gcc-mips-current/patches/patch-libgcc_config_t-hardfp
+++ b/cross/gcc-mips-current/patches/patch-libgcc_config_t-hardfp
@@ -0,0 +1,29 @@
+$NetBSD: patch-libgcc_config_t-hardfp,v 1.1 2014/03/31 09:49:32 martin Exp $
+
+Make sed invocation slightly more portable
+
+--- libgcc/config/t-hardfp.orig	2014-02-07 08:46:34.000000000 +0100
+++ libgcc/config/t-hardfp	2014-03-23 13:25:44.000000000 +0100
+@@ -51,11 +51,11 @@
+ 		    	      $(subst M,$(pair),truncM2))
+ 
+ # Regexp for matching a floating-point mode.
+-hardfp_mode_regexp := $(shell echo $(hardfp_float_modes) | sed 's/ /\\|/g')
+hardfp_mode_regexp := $(shell echo $(hardfp_float_modes) | sed 's/ /|/g')
+ 
+ # Regexp for matching the end of a function name, after the last
+ # floating-point mode.
+-hardfp_suffix_regexp := $(shell echo $(hardfp_int_modes) 2 3 | sed 's/ /\\|/g')
+hardfp_suffix_regexp := $(shell echo $(hardfp_int_modes) 2 3 | sed 's/ /|/g')
+ 
+ # Add -D options to define:
+ #   FUNC: the function name (e.g. __addsf3)
+@@ -64,7 +64,7 @@
+ #   TYPE: the last floating-point mode (e.g. sf)
+ hardfp_defines_for = \
+   $(shell echo $1 | \
+-    sed 's/\(.*\)\($(hardfp_mode_regexp)\)\($(hardfp_suffix_regexp)\|\)$$/-DFUNC=__& -DOP_\1\3 -DTYPE=\2/')
+    sed -r 's/(.*)($(hardfp_mode_regexp))($(hardfp_suffix_regexp)|.*)$$/-DFUNC=__& -DOP_\1\3 -DTYPE=\2/')
+ 
+ hardfp-o = $(patsubst %,%$(objext),$(hardfp_func_list))
+ $(hardfp-o): %$(objext): $(srcdir)/config/hardfp.c
--- a/cross/h8300-elf-gcc34/distinfo
+++ b/cross/h8300-elf-gcc34/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2013/04/30 13:26:34 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2014/09/22 11:51:14 joerg Exp $

 SHA1 (gcc-core-3.4.6.tar.gz) = 879d34505d25896c82a4f098d5512b3cd5df81cc
 RMD160 (gcc-core-3.4.6.tar.gz) = d24dadbda68df53940e3f0d98a8ab6ded6e64628
@@ -10,4 +10,5 @@ SHA1 (newlib-1.14.0.tar.gz) = edc50f5cda734b50c5431a2b8d1e579ac82ce3f9
 RMD160 (newlib-1.14.0.tar.gz) = 6f2b3f32759925142421ddc069229eff857dd106
 Size (newlib-1.14.0.tar.gz) = 7981432 bytes
 SHA1 (patch-gcc-gcc_config_h8300_h8300.c) = 4fa4462b2721a6b1afb3cf1ebfb07d943fccc11e
+SHA1 (patch-gcc_cp_cfns.h) = 6d59433144f800681c28cb19d7edf024599913dd
 SHA1 (patch-libiberty_physmem.c) = b3d0c52bafaaa7774777c9394c5e12fa8392a591
--- a/cross/h8300-elf-gcc34/patches/patch-gcc_cp_cfns.h
+++ b/cross/h8300-elf-gcc34/patches/patch-gcc_cp_cfns.h
@@ -0,0 +1,24 @@
+$NetBSD: patch-gcc_cp_cfns.h,v 1.1 2014/09/22 11:51:14 joerg Exp $
+
+--- gcc/cp/cfns.h.orig	2014-09-22 10:57:39.000000000 +0000
+++ gcc/cp/cfns.h
+@@ -34,9 +34,6 @@
+ __inline
+ #endif
+ static unsigned int hash (const char *, unsigned int);
+-#ifdef __GNUC__
+-__inline
+-#endif
+ const char * libc_name_p (const char *, unsigned int);
+ /* maximum key range = 391, duplicates = 0 */
+ 
+@@ -105,9 +102,6 @@ hash (register const char *str, register
+   return hval + asso_values[(unsigned char)str[len - 1]];
+ }
+ 
+-#ifdef __GNUC__
+-__inline
+-#endif
+ const char *
+ libc_name_p (register const char *str, register unsigned int len)
+ {
--- a/cross/h8300-hms-gcc/Makefile
+++ b/cross/h8300-hms-gcc/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.28 2013/04/06 20:27:17 rodent Exp $
+# $NetBSD: Makefile,v 1.29 2014/12/19 08:49:37 obache Exp $

 DISTNAME=		gcc-core-3.1
 PKGNAME=		cross-h8300-hms-gcc-3.1
 PKGREVISION=		6
 CATEGORIES=		cross
-MASTER_SITES=		ftp://ftp.gnu.org/gnu/gcc/gcc-3.1/ \
-			ftp://sources.redhat.com/pub/newlib/
+MASTER_SITES=		${MASTER_SITE_GNU:=gcc/gcc-3.1/}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 			${DISTNAME:S/-core-/-g++-/}${EXTRACT_SUFX} \
 			newlib-1.10.0.tar.gz

+SITES.newlib-1.10.0.tar.gz=	ftp://sources.redhat.com/pub/newlib/
 PATCH_SITES=		${MASTER_SITE_SOURCEFORGE:=h8300-hms/}
 PATCHFILES=		h8300-hms-gcc-3.1-1.patch
 PATCH_DIST_ARGS=	-d ${SRCDIR} -E -p1
--- a/cross/h8300-hms-gcc/PLIST.Darwin
+++ b/cross/h8300-hms-gcc/PLIST.Darwin
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2014/12/26 21:29:18 dholland Exp $
+libexec/cross-h8300-hms/lib/charset.alias
+libexec/cross-h8300-hms/share/locale/locale.alias
--- a/cross/libtool-base/Makefile
+++ b/cross/libtool-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 12:39:47 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2014/10/09 13:44:33 wiz Exp $

 # XXX This is kludgerific copypasta of devel/libtool-base/Makefile for
 # cross-compilation.  Please make it go away!
@@ -32,7 +32,6 @@
 #PKGNAME=	${DISTNAME:S/-/-base-/}
 PKGNAME=	${DISTNAME:S/^libtool-/cross-libtool-base-${MACHINE_ARCH}-/}
 PKGREVISION=	2
-SVR4_PKGNAME=	ltoob

 COMMENT=	Generic shared library support script (the script itself)

--- a/cross/mingw-runtime-bin/Makefile
+++ b/cross/mingw-runtime-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/10/03 00:10:30 asau Exp $
+# $NetBSD: Makefile,v 1.3 2014/04/19 01:15:20 asau Exp $

 DISTNAME=	mingw-runtime-3.14
 PKGNAME=	mingw-runtime-bin-3.14
@@ -18,7 +18,7 @@ WRKSRC=		${WRKDIR}
 INSTALLATION_DIRS+=	${MINGW_TARGET}

 do-install:
-	cd ${WRKSRC} && pax -rw -pe bin include lib \
+	cd ${WRKSRC} && pax -rw -pp bin include lib \
 		${DESTDIR}${PREFIX}/${MINGW_TARGET}

 .include "../../cross/mingw/Makefile.common"
--- a/cross/mingw-w32api-bin/Makefile
+++ b/cross/mingw-w32api-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/10/03 00:10:30 asau Exp $
+# $NetBSD: Makefile,v 1.3 2014/04/19 01:15:46 asau Exp $

 DISTNAME=		w32api-3.11
 PKGNAME=		mingw-w32api-bin-3.11
@@ -18,7 +18,7 @@ WRKSRC=			${WRKDIR}
 INSTALLATION_DIRS+=	${MINGW_TARGET}

 do-install:
-	cd ${WRKSRC} && pax -rw -pe include lib \
+	cd ${WRKSRC} && pax -rw -pp include lib \
 		${DESTDIR}${PREFIX}/${MINGW_TARGET}

 .include "../../cross/mingw/Makefile.common"
--- a/cross/mingw/Makefile.common
+++ b/cross/mingw/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2010/03/15 18:34:36 asau Exp $
+# $NetBSD: Makefile.common,v 1.2 2014/12/10 23:21:40 joerg Exp $
 #
 # used by cross/mingw-gcc/buildlink3.mk
 # used by cross/mingw-binutils/Makefile
@@ -16,7 +16,7 @@ PLIST_SUBST+=		MINGW_TARGET=${MINGW_TARGET:Q}
 MAKE_ENV+=		MINGW_TARGET=${MINGW_TARGET:Q}
 CONFIGURE_ENV+=		MINGW_TARGET=${MINGW_TARGET:Q}

-PATH:=			${CROSSBASE}/bin:${PATH}
+PREPEND_PATH+=		${CROSSBASE}/bin

 .if defined(GNU_CONFIGURE)
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
--- 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.
--- a/cross/nios2-binutils/Makefile
+++ b/cross/nios2-binutils/Makefile
@@ -1,48 +1,45 @@
-# $NetBSD: Makefile,v 1.7 2014/03/18 15:34:04 mef Exp $
-.include		"../../cross/nios2/Makefile.common"
-PKGNAME=		nios2-binutils-${PKG_VERSION}
-PKG_VERSION=		2.23
+# $NetBSD: Makefile,v 1.13 2014/11/10 03:34:53 mef Exp $
+
+DISTNAME=		binutils-2.24
+PKGNAME=		${DISTNAME:S/^/nios2-/}
+PKGREVISION=		2
+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_GNU_CONFIGURE_HOST=	no
+INFO_FILES=		# empty

-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
+# follows to devel/binutils
+# PR pkg/48504, ksh is sufficient for NetBSD 5.2 and NetBSD 6.1
+.include "../../mk/bsd.prefs.mk"
+.if !empty(MACHINE_PLATFORM:MNetBSD-[5-6].*-*) && \
+       empty(MACHINE_PLATFORM:MNetBSD-6.99.*-*)
+USE_TOOLS+=	       ksh
+CONFIG_SHELL=	       ksh
 .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}
+.include		"options.mk"

-# 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}
+NIOS2_TARGET=		nios2-elf
+CONFIGURE_ARGS+=	--disable-werror --target=${NIOS2_TARGET} --disable-nls
+PLIST_SUBST+=		NIOS2_TARGET=${NIOS2_TARGET:Q}

-.include "options.mk"
-
-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;\
-	)
+USE_CROSSBASE=		yes
+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:
@@ -50,8 +47,3 @@ 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
-PKGSRC_MAKE_ENV+=	SH=/bin/ksh
--- 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
--- 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
--- a/cross/nios2-binutils/patches/patch-ab
+++ 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
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`A binutils-current snapshot suitable for NetBSD/playstation2`
				`@@ -0,0 +1 @@`
				`A gcc-current snapshot suitable to build kernels for NetBSD/playstation2.`