diff --git a/external/gpl3/gcc/lib/libgcc/Makefile.inc b/external/gpl3/gcc/lib/libgcc/Makefile.inc
index a17a783190bf..018765107b64 100644
--- a/external/gpl3/gcc/lib/libgcc/Makefile.inc
+++ b/external/gpl3/gcc/lib/libgcc/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.26 2014/05/03 16:43:10 martin Exp $
+#	$NetBSD: Makefile.inc,v 1.27 2014/05/15 14:37:08 joerg Exp $
 
 LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
 
@@ -92,11 +92,13 @@ LIB2FUNCS=	${LIB2FUNCS_SHORT:=.c}
 LIB2FUNCS_ST=	${G_LIB2FUNCS_ST:=.c}
 LIB2DIVMOD=	${LIB2_DIVMOD_FUNCS:=.c}
 .if ${HAVE_LIBGCC_EH} == "no"
-LIB2_EH=	${G_LIB2ADDEH:M*.c:T:Nunwind-dw2.c:Nunwind-dw2-fde-dip.c:Nunwind-sjlj.c:Nunwind-c.c}
+LIB2_EH=	${G_LIB2ADDEH:M*.c:T:Nunwind-dw2.c:Nunwind-dw2-fde-dip.c:Nunwind-sjlj.c:Nunwind-c.c:Nunwind-arm.c:Npr-support.c}
+LIB2_EHASM=	${G_LIB2ADDEH:M*.S:T:Nlibunwind.S}
+G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
 .else
 LIB2_EH=	${G_LIB2ADDEH:M*.c:T}
-.endif
 LIB2_EHASM=	${G_LIB2ADDEH:M*.S:T}
+.endif
 
 # We have to weed out any existing func.S file that may exist
 # from the list of files we create.
diff --git a/external/gpl3/gcc/lib/libobjc/Makefile b/external/gpl3/gcc/lib/libobjc/Makefile
index fc9eb82efbee..8b528ec27ab2 100644
--- a/external/gpl3/gcc/lib/libobjc/Makefile
+++ b/external/gpl3/gcc/lib/libobjc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2014/03/14 12:17:53 christos Exp $
+#	$NetBSD: Makefile,v 1.12 2014/05/15 14:37:08 joerg Exp $
 
 REQUIRETOOLS=	yes
 NOLINT=		# defined
@@ -76,6 +76,10 @@ ${OBJS} ${POBJS} ${SOBJS}: runtime-info.h
 
 ${SRCS}: tconfig.h options.h
 
+.if ${HAVE_LIBGCC_EH} == "no"
+G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
+.endif
+
 .if ${MKGCC} != "no"
 .if defined(G_CONFIGLINKS) && !empty(G_CONFIGLINKS)
 BUILDSYMLINKS+=	${G_CONFIGLINKS}
diff --git a/external/gpl3/gcc/lib/libstdc++-v3/Makefile b/external/gpl3/gcc/lib/libstdc++-v3/Makefile
index 4ed77f6f78cf..8e800eae0e11 100644
--- a/external/gpl3/gcc/lib/libstdc++-v3/Makefile
+++ b/external/gpl3/gcc/lib/libstdc++-v3/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2014/03/01 10:00:45 mrg Exp $
+#	$NetBSD: Makefile,v 1.10 2014/05/15 14:37:08 joerg Exp $
 
 REQUIRETOOLS=	yes
 NOLINT=		# defined
@@ -110,6 +110,10 @@ BUILDSYMLINKS+=	\
 	${DIST}/libiberty/cp-demangle.c cp-demangle.c \
 	${DIST}/libiberty/cp-demangle.h cp-demangle.h
 
+.if ${HAVE_LIBGCC_EH} == "no"
+G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
+.endif
+
 .if ${MKGCC} != "no"
 .if defined(G_CONFIGLINKS) && !empty(G_CONFIGLINKS)
 BUILDSYMLINKS+=        ${G_CONFIGLINKS}
diff --git a/external/gpl3/gcc/lib/libsupc++/Makefile b/external/gpl3/gcc/lib/libsupc++/Makefile
index 91edb9be7d6e..100aa18c2642 100644
--- a/external/gpl3/gcc/lib/libsupc++/Makefile
+++ b/external/gpl3/gcc/lib/libsupc++/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2014/03/01 10:00:48 mrg Exp $
+#	$NetBSD: Makefile,v 1.8 2014/05/15 14:37:08 joerg Exp $
 
 REQUIRETOOLS=	yes
 NOLINT=		# defined
@@ -27,6 +27,10 @@ CXXFLAGS+=	${G_SECTION_FLAGS}
 
 COPTS.cp-demangle.c = -Wno-stack-protector
 
+.if ${HAVE_LIBGCC_EH} == "no"
+G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
+.endif
+
 .if ${MKGCC} != "no"
 .if defined(G_CONFIGLINKS) && !empty(G_CONFIGLINKS)
 BUILDSYMLINKS+=        ${G_CONFIGLINKS}