- update arm-elf-gcc to 4.4.4

tested by and ok MAINTAINER
2010-10-22 15:20:04 +00:00 · 2010-10-22 15:20:04 +00:00 · 238fedab37
commit 238fedab37
parent 755ae3d6b5
10 changed files with 467 additions and 292 deletions
--- a/devel/arm-elf/gcc/Makefile
+++ b/devel/arm-elf/gcc/Makefile
@ -1,22 +1,14 @@
-# $OpenBSD: Makefile,v 1.8 2010/10/18 17:47:50 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2010/10/22 15:20:04 jasper Exp $

 COMMENT=	gcc for arm-elf cross-development

-VERSION=	3.4.5
-FULL_VERSION=	3.4-20050913
-DISTNAME=	gcc-${FULL_VERSION}
+VERSION=	4.4.4
+DISTNAME=	gcc-${VERSION}
 PKGNAME=	${CONFIG}-gcc-${VERSION}
-REVISION=	2

 SUBST_VARS+=	VERSION

-# GPL
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_FTP=	Yes
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-
-WANTLIB=	c
+WANTLIB=	c gmp mpfr
 DIST_SUBDIR=	gcc

 MAKE_GXX=	No
@ -25,22 +17,26 @@ MAKE_OBJC=	No
 MAKE_JAVA=	No
 MAKE_ADA=	No

-EXTRACT_SUFX=	.tar.bz2
-
-MASTER_SITES= 	http://distfiles.nl/
+MASTER_SITES= 	${MASTER_SITE_GCC:=releases/gcc-$(VERSION)/}

 BUILD_DEPENDS+=	:autoconf-2.13:devel/autoconf/2.13	\
 		::devel/bison				\
 		::devel/metaauto			\
 		::devel/arm-elf/binutils

+LIB_DEPENDS=	::devel/mpfr
+
 LANGS=		c,c++
 CC=		/usr/bin/gcc
 CFLAGS=		-O2 -g

 CONFIGURE_ARGS+=--enable-languages=${LANGS}	\
 		--enable-multilib		\
+		--enable-interwork		\
+		--with-newlib			\
 		--enable-cpp
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"

 # cope with user settings in /etc/mk.conf
 MAKE_FLAGS=	LANGUAGES="c c++" CFLAGS="-I/usr/local/include"
@ -55,6 +51,6 @@ REGRESS_DEPENDS=::devel/dejagnu

 post-install:
 	chown -R ${SHAREOWN}:${SHAREGRP} \
-		${PREFIX}/lib/gcc/${CONFIG}/${VERSION}/include
+		${PREFIX}/lib/gcc/${CONFIG}/${VERSION}/

 .include <bsd.port.mk>
--- a/devel/arm-elf/gcc/distinfo
+++ b/devel/arm-elf/gcc/distinfo
@ -1,5 +1,5 @@
-MD5 (gcc/gcc-3.4-20050913.tar.bz2) = xE6z6wCF/NtJqtg6GAn9DQ==
-RMD160 (gcc/gcc-3.4-20050913.tar.bz2) = mXOAbzTS7NN7GbjrBYfmrOMGp3U=
-SHA1 (gcc/gcc-3.4-20050913.tar.bz2) = gQXAc80TRFE/uNMCPErESSwijR8=
-SHA256 (gcc/gcc-3.4-20050913.tar.bz2) = lWbVCaNEJF0bLApO1FZOdHWw2mg6OhDhwXEZEfpu98c=
-SIZE (gcc/gcc-3.4-20050913.tar.bz2) = 25285388
+MD5 (gcc/gcc-4.4.4.tar.bz2) = f/XOnl8LCIq0hyC71yA1MA==
+RMD160 (gcc/gcc-4.4.4.tar.bz2) = tB8mvijMHvZDE1Iw36lIdtigLdY=
+SHA1 (gcc/gcc-4.4.4.tar.bz2) = RdHnJCoIy7ejQ+0r9kClr9Dr4Jg=
+SHA256 (gcc/gcc-4.4.4.tar.bz2) = 4cE2lrRXUq0/ZSME+rUSCkOopcD0ONO9p4zxa2IMDFg=
+SIZE (gcc/gcc-4.4.4.tar.bz2) = 63018867
--- a/devel/arm-elf/gcc/patches/patch-Makefile_in
+++ b/devel/arm-elf/gcc/patches/patch-Makefile_in
@ -1,13 +1,16 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2007/10/05 13:14:13 sturm Exp $
--- Makefile.in.orig	Wed Sep 14 01:56:45 2005
-+++ Makefile.in	Fri Oct  5 15:04:31 2007
-@@ -597,22 +597,7 @@ configure-host: maybe-configure-gcc  \
-     maybe-configure-utils
+$OpenBSD: patch-Makefile_in,v 1.3 2010/10/22 15:20:04 jasper Exp $
+--- Makefile.in.orig	Sat Apr 25 06:10:29 2009
+++ Makefile.in	Thu Oct 14 12:03:35 2010
+@@ -749,27 +749,8 @@ configure-host:  \
+     maybe-configure-gnattools
 .PHONY: configure-target
 configure-target:  \
 -    maybe-configure-target-libstdc++-v3 \
+-    maybe-configure-target-libmudflap \
+-    maybe-configure-target-libssp \
     maybe-configure-target-newlib \
-    maybe-configure-target-libf2c \
+-    maybe-configure-target-libgcc \
+-    maybe-configure-target-libgfortran \
 -    maybe-configure-target-libobjc \
 -    maybe-configure-target-libtermcap \
 -    maybe-configure-target-winsup \
@ -20,248 +23,389 @@ $OpenBSD: patch-Makefile_in,v 1.2 2007/10/05 13:14:13 sturm Exp $
 -    maybe-configure-target-zlib \
 -    maybe-configure-target-boehm-gc \
 -    maybe-configure-target-qthreads \
-    maybe-configure-target-rda
+-    maybe-configure-target-rda \
+-    maybe-configure-target-libada \
+-    maybe-configure-target-libgomp
+    maybe-configure-target-libgcc
+ 
+ # The target built for a native non-bootstrap build.
+ .PHONY: all
+@@ -910,29 +891,10 @@ all-host: maybe-all-gnattools
 
- # The target built for a native build.
- .PHONY: all.normal
-@@ -686,22 +671,7 @@ all-host: maybe-all-gcc  \
-     maybe-all-utils
 .PHONY: all-target
- all-target:  \
-    maybe-all-target-libstdc++-v3 \
-     maybe-all-target-newlib \
-    maybe-all-target-libf2c \
-    maybe-all-target-libobjc \
-    maybe-all-target-libtermcap \
-    maybe-all-target-winsup \
-    maybe-all-target-libgloss \
-    maybe-all-target-libiberty \
-    maybe-all-target-gperf \
-    maybe-all-target-examples \
-    maybe-all-target-libffi \
-    maybe-all-target-libjava \
-    maybe-all-target-zlib \
-    maybe-all-target-boehm-gc \
-    maybe-all-target-qthreads \
-    maybe-all-target-rda
+ 
+-all-target: maybe-all-target-libstdc++-v3
+-all-target: maybe-all-target-libmudflap
+-all-target: maybe-all-target-libssp
+ all-target: maybe-all-target-newlib
+ @if target-libgcc-no-bootstrap
+ all-target: maybe-all-target-libgcc
+ @endif target-libgcc-no-bootstrap
+-all-target: maybe-all-target-libgfortran
+-all-target: maybe-all-target-libobjc
+-all-target: maybe-all-target-libtermcap
+-all-target: maybe-all-target-winsup
+-all-target: maybe-all-target-libgloss
+-all-target: maybe-all-target-libiberty
+-all-target: maybe-all-target-gperf
+-all-target: maybe-all-target-examples
+-all-target: maybe-all-target-libffi
+-all-target: maybe-all-target-libjava
+-all-target: maybe-all-target-zlib
+-all-target: maybe-all-target-boehm-gc
+-all-target: maybe-all-target-qthreads
+-all-target: maybe-all-target-rda
+-all-target: maybe-all-target-libada
+-all-target: maybe-all-target-libgomp
 
 # Do a target for all the subdirectories.  A ``make do-X'' will do a
 # ``make X'' in all subdirectories (because, in general, there is a
-@@ -780,22 +750,7 @@ info-host: maybe-info-gcc  \
+@@ -1027,27 +989,8 @@ info-host: maybe-info-gnattools
 
 .PHONY: info-target
- info-target:  \
-    maybe-info-target-libstdc++-v3 \
-     maybe-info-target-newlib \
-    maybe-info-target-libf2c \
-    maybe-info-target-libobjc \
-    maybe-info-target-libtermcap \
-    maybe-info-target-winsup \
-    maybe-info-target-libgloss \
-    maybe-info-target-libiberty \
-    maybe-info-target-gperf \
-    maybe-info-target-examples \
-    maybe-info-target-libffi \
-    maybe-info-target-libjava \
-    maybe-info-target-zlib \
-    maybe-info-target-boehm-gc \
-    maybe-info-target-qthreads \
-    maybe-info-target-rda
 
- # GCC, the eternal special case
- .PHONY: maybe-info-gcc info-gcc
-@@ -2656,22 +2611,7 @@ dvi-host: maybe-dvi-gcc  \
+-info-target: maybe-info-target-libstdc++-v3
+-info-target: maybe-info-target-libmudflap
+-info-target: maybe-info-target-libssp
+ info-target: maybe-info-target-newlib
+ info-target: maybe-info-target-libgcc
+-info-target: maybe-info-target-libgfortran
+-info-target: maybe-info-target-libobjc
+-info-target: maybe-info-target-libtermcap
+-info-target: maybe-info-target-winsup
+-info-target: maybe-info-target-libgloss
+-info-target: maybe-info-target-libiberty
+-info-target: maybe-info-target-gperf
+-info-target: maybe-info-target-examples
+-info-target: maybe-info-target-libffi
+-info-target: maybe-info-target-libjava
+-info-target: maybe-info-target-zlib
+-info-target: maybe-info-target-boehm-gc
+-info-target: maybe-info-target-qthreads
+-info-target: maybe-info-target-rda
+-info-target: maybe-info-target-libada
+-info-target: maybe-info-target-libgomp
+ 
+ .PHONY: do-dvi
+ do-dvi:
+@@ -1137,27 +1080,8 @@ dvi-host: maybe-dvi-gnattools
 
 .PHONY: dvi-target
- dvi-target:  \
-    maybe-dvi-target-libstdc++-v3 \
-     maybe-dvi-target-newlib \
-    maybe-dvi-target-libf2c \
-    maybe-dvi-target-libobjc \
-    maybe-dvi-target-libtermcap \
-    maybe-dvi-target-winsup \
-    maybe-dvi-target-libgloss \
-    maybe-dvi-target-libiberty \
-    maybe-dvi-target-gperf \
-    maybe-dvi-target-examples \
-    maybe-dvi-target-libffi \
-    maybe-dvi-target-libjava \
-    maybe-dvi-target-zlib \
-    maybe-dvi-target-boehm-gc \
-    maybe-dvi-target-qthreads \
-    maybe-dvi-target-rda
 
- # GCC, the eternal special case
- .PHONY: maybe-dvi-gcc dvi-gcc
-@@ -4532,22 +4472,7 @@ TAGS-host: maybe-TAGS-gcc  \
+-dvi-target: maybe-dvi-target-libstdc++-v3
+-dvi-target: maybe-dvi-target-libmudflap
+-dvi-target: maybe-dvi-target-libssp
+ dvi-target: maybe-dvi-target-newlib
+ dvi-target: maybe-dvi-target-libgcc
+-dvi-target: maybe-dvi-target-libgfortran
+-dvi-target: maybe-dvi-target-libobjc
+-dvi-target: maybe-dvi-target-libtermcap
+-dvi-target: maybe-dvi-target-winsup
+-dvi-target: maybe-dvi-target-libgloss
+-dvi-target: maybe-dvi-target-libiberty
+-dvi-target: maybe-dvi-target-gperf
+-dvi-target: maybe-dvi-target-examples
+-dvi-target: maybe-dvi-target-libffi
+-dvi-target: maybe-dvi-target-libjava
+-dvi-target: maybe-dvi-target-zlib
+-dvi-target: maybe-dvi-target-boehm-gc
+-dvi-target: maybe-dvi-target-qthreads
+-dvi-target: maybe-dvi-target-rda
+-dvi-target: maybe-dvi-target-libada
+-dvi-target: maybe-dvi-target-libgomp
+ 
+ .PHONY: do-pdf
+ do-pdf:
+@@ -1247,27 +1171,8 @@ pdf-host: maybe-pdf-gnattools
+ 
+ .PHONY: pdf-target
+ 
+-pdf-target: maybe-pdf-target-libstdc++-v3
+-pdf-target: maybe-pdf-target-libmudflap
+-pdf-target: maybe-pdf-target-libssp
+ pdf-target: maybe-pdf-target-newlib
+ pdf-target: maybe-pdf-target-libgcc
+-pdf-target: maybe-pdf-target-libgfortran
+-pdf-target: maybe-pdf-target-libobjc
+-pdf-target: maybe-pdf-target-libtermcap
+-pdf-target: maybe-pdf-target-winsup
+-pdf-target: maybe-pdf-target-libgloss
+-pdf-target: maybe-pdf-target-libiberty
+-pdf-target: maybe-pdf-target-gperf
+-pdf-target: maybe-pdf-target-examples
+-pdf-target: maybe-pdf-target-libffi
+-pdf-target: maybe-pdf-target-libjava
+-pdf-target: maybe-pdf-target-zlib
+-pdf-target: maybe-pdf-target-boehm-gc
+-pdf-target: maybe-pdf-target-qthreads
+-pdf-target: maybe-pdf-target-rda
+-pdf-target: maybe-pdf-target-libada
+-pdf-target: maybe-pdf-target-libgomp
+ 
+ .PHONY: do-html
+ do-html:
+@@ -1357,27 +1262,8 @@ html-host: maybe-html-gnattools
+ 
+ .PHONY: html-target
+ 
+-html-target: maybe-html-target-libstdc++-v3
+-html-target: maybe-html-target-libmudflap
+-html-target: maybe-html-target-libssp
+ html-target: maybe-html-target-newlib
+ html-target: maybe-html-target-libgcc
+-html-target: maybe-html-target-libgfortran
+-html-target: maybe-html-target-libobjc
+-html-target: maybe-html-target-libtermcap
+-html-target: maybe-html-target-winsup
+-html-target: maybe-html-target-libgloss
+-html-target: maybe-html-target-libiberty
+-html-target: maybe-html-target-gperf
+-html-target: maybe-html-target-examples
+-html-target: maybe-html-target-libffi
+-html-target: maybe-html-target-libjava
+-html-target: maybe-html-target-zlib
+-html-target: maybe-html-target-boehm-gc
+-html-target: maybe-html-target-qthreads
+-html-target: maybe-html-target-rda
+-html-target: maybe-html-target-libada
+-html-target: maybe-html-target-libgomp
+ 
+ .PHONY: do-TAGS
+ do-TAGS:
+@@ -1467,27 +1353,8 @@ TAGS-host: maybe-TAGS-gnattools
 
 .PHONY: TAGS-target
- TAGS-target:  \
-    maybe-TAGS-target-libstdc++-v3 \
-     maybe-TAGS-target-newlib \
-    maybe-TAGS-target-libf2c \
-    maybe-TAGS-target-libobjc \
-    maybe-TAGS-target-libtermcap \
-    maybe-TAGS-target-winsup \
-    maybe-TAGS-target-libgloss \
-    maybe-TAGS-target-libiberty \
-    maybe-TAGS-target-gperf \
-    maybe-TAGS-target-examples \
-    maybe-TAGS-target-libffi \
-    maybe-TAGS-target-libjava \
-    maybe-TAGS-target-zlib \
-    maybe-TAGS-target-boehm-gc \
-    maybe-TAGS-target-qthreads \
-    maybe-TAGS-target-rda
 
- # GCC, the eternal special case
- .PHONY: maybe-TAGS-gcc TAGS-gcc
-@@ -6408,22 +6333,7 @@ install-info-host: maybe-install-info-gcc  \
+-TAGS-target: maybe-TAGS-target-libstdc++-v3
+-TAGS-target: maybe-TAGS-target-libmudflap
+-TAGS-target: maybe-TAGS-target-libssp
+ TAGS-target: maybe-TAGS-target-newlib
+ TAGS-target: maybe-TAGS-target-libgcc
+-TAGS-target: maybe-TAGS-target-libgfortran
+-TAGS-target: maybe-TAGS-target-libobjc
+-TAGS-target: maybe-TAGS-target-libtermcap
+-TAGS-target: maybe-TAGS-target-winsup
+-TAGS-target: maybe-TAGS-target-libgloss
+-TAGS-target: maybe-TAGS-target-libiberty
+-TAGS-target: maybe-TAGS-target-gperf
+-TAGS-target: maybe-TAGS-target-examples
+-TAGS-target: maybe-TAGS-target-libffi
+-TAGS-target: maybe-TAGS-target-libjava
+-TAGS-target: maybe-TAGS-target-zlib
+-TAGS-target: maybe-TAGS-target-boehm-gc
+-TAGS-target: maybe-TAGS-target-qthreads
+-TAGS-target: maybe-TAGS-target-rda
+-TAGS-target: maybe-TAGS-target-libada
+-TAGS-target: maybe-TAGS-target-libgomp
+ 
+ .PHONY: do-install-info
+ do-install-info:
+@@ -1577,27 +1444,8 @@ install-info-host: maybe-install-info-gnattools
 
 .PHONY: install-info-target
- install-info-target:  \
-    maybe-install-info-target-libstdc++-v3 \
-     maybe-install-info-target-newlib \
-    maybe-install-info-target-libf2c \
-    maybe-install-info-target-libobjc \
-    maybe-install-info-target-libtermcap \
-    maybe-install-info-target-winsup \
-    maybe-install-info-target-libgloss \
-    maybe-install-info-target-libiberty \
-    maybe-install-info-target-gperf \
-    maybe-install-info-target-examples \
-    maybe-install-info-target-libffi \
-    maybe-install-info-target-libjava \
-    maybe-install-info-target-zlib \
-    maybe-install-info-target-boehm-gc \
-    maybe-install-info-target-qthreads \
-    maybe-install-info-target-rda
 
- # GCC, the eternal special case
- .PHONY: maybe-install-info-gcc install-info-gcc
-@@ -8365,22 +8275,7 @@ installcheck-host: maybe-installcheck-gcc  \
+-install-info-target: maybe-install-info-target-libstdc++-v3
+-install-info-target: maybe-install-info-target-libmudflap
+-install-info-target: maybe-install-info-target-libssp
+ install-info-target: maybe-install-info-target-newlib
+ install-info-target: maybe-install-info-target-libgcc
+-install-info-target: maybe-install-info-target-libgfortran
+-install-info-target: maybe-install-info-target-libobjc
+-install-info-target: maybe-install-info-target-libtermcap
+-install-info-target: maybe-install-info-target-winsup
+-install-info-target: maybe-install-info-target-libgloss
+-install-info-target: maybe-install-info-target-libiberty
+-install-info-target: maybe-install-info-target-gperf
+-install-info-target: maybe-install-info-target-examples
+-install-info-target: maybe-install-info-target-libffi
+-install-info-target: maybe-install-info-target-libjava
+-install-info-target: maybe-install-info-target-zlib
+-install-info-target: maybe-install-info-target-boehm-gc
+-install-info-target: maybe-install-info-target-qthreads
+-install-info-target: maybe-install-info-target-rda
+-install-info-target: maybe-install-info-target-libada
+-install-info-target: maybe-install-info-target-libgomp
+ 
+ .PHONY: do-install-pdf
+ do-install-pdf:
+@@ -1687,27 +1535,8 @@ install-pdf-host: maybe-install-pdf-gnattools
+ 
+ .PHONY: install-pdf-target
+ 
+-install-pdf-target: maybe-install-pdf-target-libstdc++-v3
+-install-pdf-target: maybe-install-pdf-target-libmudflap
+-install-pdf-target: maybe-install-pdf-target-libssp
+ install-pdf-target: maybe-install-pdf-target-newlib
+ install-pdf-target: maybe-install-pdf-target-libgcc
+-install-pdf-target: maybe-install-pdf-target-libgfortran
+-install-pdf-target: maybe-install-pdf-target-libobjc
+-install-pdf-target: maybe-install-pdf-target-libtermcap
+-install-pdf-target: maybe-install-pdf-target-winsup
+-install-pdf-target: maybe-install-pdf-target-libgloss
+-install-pdf-target: maybe-install-pdf-target-libiberty
+-install-pdf-target: maybe-install-pdf-target-gperf
+-install-pdf-target: maybe-install-pdf-target-examples
+-install-pdf-target: maybe-install-pdf-target-libffi
+-install-pdf-target: maybe-install-pdf-target-libjava
+-install-pdf-target: maybe-install-pdf-target-zlib
+-install-pdf-target: maybe-install-pdf-target-boehm-gc
+-install-pdf-target: maybe-install-pdf-target-qthreads
+-install-pdf-target: maybe-install-pdf-target-rda
+-install-pdf-target: maybe-install-pdf-target-libada
+-install-pdf-target: maybe-install-pdf-target-libgomp
+ 
+ .PHONY: do-install-html
+ do-install-html:
+@@ -1797,27 +1626,8 @@ install-html-host: maybe-install-html-gnattools
+ 
+ .PHONY: install-html-target
+ 
+-install-html-target: maybe-install-html-target-libstdc++-v3
+-install-html-target: maybe-install-html-target-libmudflap
+-install-html-target: maybe-install-html-target-libssp
+ install-html-target: maybe-install-html-target-newlib
+ install-html-target: maybe-install-html-target-libgcc
+-install-html-target: maybe-install-html-target-libgfortran
+-install-html-target: maybe-install-html-target-libobjc
+-install-html-target: maybe-install-html-target-libtermcap
+-install-html-target: maybe-install-html-target-winsup
+-install-html-target: maybe-install-html-target-libgloss
+-install-html-target: maybe-install-html-target-libiberty
+-install-html-target: maybe-install-html-target-gperf
+-install-html-target: maybe-install-html-target-examples
+-install-html-target: maybe-install-html-target-libffi
+-install-html-target: maybe-install-html-target-libjava
+-install-html-target: maybe-install-html-target-zlib
+-install-html-target: maybe-install-html-target-boehm-gc
+-install-html-target: maybe-install-html-target-qthreads
+-install-html-target: maybe-install-html-target-rda
+-install-html-target: maybe-install-html-target-libada
+-install-html-target: maybe-install-html-target-libgomp
+ 
+ .PHONY: do-installcheck
+ do-installcheck:
+@@ -1907,27 +1717,8 @@ installcheck-host: maybe-installcheck-gnattools
 
 .PHONY: installcheck-target
- installcheck-target:  \
-    maybe-installcheck-target-libstdc++-v3 \
-     maybe-installcheck-target-newlib \
-    maybe-installcheck-target-libf2c \
-    maybe-installcheck-target-libobjc \
-    maybe-installcheck-target-libtermcap \
-    maybe-installcheck-target-winsup \
-    maybe-installcheck-target-libgloss \
-    maybe-installcheck-target-libiberty \
-    maybe-installcheck-target-gperf \
-    maybe-installcheck-target-examples \
-    maybe-installcheck-target-libffi \
-    maybe-installcheck-target-libjava \
-    maybe-installcheck-target-zlib \
-    maybe-installcheck-target-boehm-gc \
-    maybe-installcheck-target-qthreads \
-    maybe-installcheck-target-rda
 
- # GCC, the eternal special case
- .PHONY: maybe-installcheck-gcc installcheck-gcc
-@@ -10241,22 +10136,7 @@ mostlyclean-host: maybe-mostlyclean-gcc  \
+-installcheck-target: maybe-installcheck-target-libstdc++-v3
+-installcheck-target: maybe-installcheck-target-libmudflap
+-installcheck-target: maybe-installcheck-target-libssp
+ installcheck-target: maybe-installcheck-target-newlib
+ installcheck-target: maybe-installcheck-target-libgcc
+-installcheck-target: maybe-installcheck-target-libgfortran
+-installcheck-target: maybe-installcheck-target-libobjc
+-installcheck-target: maybe-installcheck-target-libtermcap
+-installcheck-target: maybe-installcheck-target-winsup
+-installcheck-target: maybe-installcheck-target-libgloss
+-installcheck-target: maybe-installcheck-target-libiberty
+-installcheck-target: maybe-installcheck-target-gperf
+-installcheck-target: maybe-installcheck-target-examples
+-installcheck-target: maybe-installcheck-target-libffi
+-installcheck-target: maybe-installcheck-target-libjava
+-installcheck-target: maybe-installcheck-target-zlib
+-installcheck-target: maybe-installcheck-target-boehm-gc
+-installcheck-target: maybe-installcheck-target-qthreads
+-installcheck-target: maybe-installcheck-target-rda
+-installcheck-target: maybe-installcheck-target-libada
+-installcheck-target: maybe-installcheck-target-libgomp
+ 
+ .PHONY: do-mostlyclean
+ do-mostlyclean:
+@@ -2017,27 +1808,8 @@ mostlyclean-host: maybe-mostlyclean-gnattools
 
 .PHONY: mostlyclean-target
- mostlyclean-target:  \
-    maybe-mostlyclean-target-libstdc++-v3 \
-     maybe-mostlyclean-target-newlib \
-    maybe-mostlyclean-target-libf2c \
-    maybe-mostlyclean-target-libobjc \
-    maybe-mostlyclean-target-libtermcap \
-    maybe-mostlyclean-target-winsup \
-    maybe-mostlyclean-target-libgloss \
-    maybe-mostlyclean-target-libiberty \
-    maybe-mostlyclean-target-gperf \
-    maybe-mostlyclean-target-examples \
-    maybe-mostlyclean-target-libffi \
-    maybe-mostlyclean-target-libjava \
-    maybe-mostlyclean-target-zlib \
-    maybe-mostlyclean-target-boehm-gc \
-    maybe-mostlyclean-target-qthreads \
-    maybe-mostlyclean-target-rda
 
- # GCC, the eternal special case
- .PHONY: maybe-mostlyclean-gcc mostlyclean-gcc
-@@ -11994,22 +11874,7 @@ clean-host: maybe-clean-gcc  \
+-mostlyclean-target: maybe-mostlyclean-target-libstdc++-v3
+-mostlyclean-target: maybe-mostlyclean-target-libmudflap
+-mostlyclean-target: maybe-mostlyclean-target-libssp
+ mostlyclean-target: maybe-mostlyclean-target-newlib
+ mostlyclean-target: maybe-mostlyclean-target-libgcc
+-mostlyclean-target: maybe-mostlyclean-target-libgfortran
+-mostlyclean-target: maybe-mostlyclean-target-libobjc
+-mostlyclean-target: maybe-mostlyclean-target-libtermcap
+-mostlyclean-target: maybe-mostlyclean-target-winsup
+-mostlyclean-target: maybe-mostlyclean-target-libgloss
+-mostlyclean-target: maybe-mostlyclean-target-libiberty
+-mostlyclean-target: maybe-mostlyclean-target-gperf
+-mostlyclean-target: maybe-mostlyclean-target-examples
+-mostlyclean-target: maybe-mostlyclean-target-libffi
+-mostlyclean-target: maybe-mostlyclean-target-libjava
+-mostlyclean-target: maybe-mostlyclean-target-zlib
+-mostlyclean-target: maybe-mostlyclean-target-boehm-gc
+-mostlyclean-target: maybe-mostlyclean-target-qthreads
+-mostlyclean-target: maybe-mostlyclean-target-rda
+-mostlyclean-target: maybe-mostlyclean-target-libada
+-mostlyclean-target: maybe-mostlyclean-target-libgomp
+ 
+ .PHONY: do-clean
+ do-clean:
+@@ -2127,27 +1899,8 @@ clean-host: maybe-clean-gnattools
 
 .PHONY: clean-target
- clean-target:  \
-    maybe-clean-target-libstdc++-v3 \
-     maybe-clean-target-newlib \
-    maybe-clean-target-libf2c \
-    maybe-clean-target-libobjc \
-    maybe-clean-target-libtermcap \
-    maybe-clean-target-winsup \
-    maybe-clean-target-libgloss \
-    maybe-clean-target-libiberty \
-    maybe-clean-target-gperf \
-    maybe-clean-target-examples \
-    maybe-clean-target-libffi \
-    maybe-clean-target-libjava \
-    maybe-clean-target-zlib \
-    maybe-clean-target-boehm-gc \
-    maybe-clean-target-qthreads \
-    maybe-clean-target-rda
 
- # GCC, the eternal special case
- .PHONY: maybe-clean-gcc clean-gcc
-@@ -13761,22 +13626,7 @@ distclean-host: maybe-distclean-gcc  \
+-clean-target: maybe-clean-target-libstdc++-v3
+-clean-target: maybe-clean-target-libmudflap
+-clean-target: maybe-clean-target-libssp
+ clean-target: maybe-clean-target-newlib
+ clean-target: maybe-clean-target-libgcc
+-clean-target: maybe-clean-target-libgfortran
+-clean-target: maybe-clean-target-libobjc
+-clean-target: maybe-clean-target-libtermcap
+-clean-target: maybe-clean-target-winsup
+-clean-target: maybe-clean-target-libgloss
+-clean-target: maybe-clean-target-libiberty
+-clean-target: maybe-clean-target-gperf
+-clean-target: maybe-clean-target-examples
+-clean-target: maybe-clean-target-libffi
+-clean-target: maybe-clean-target-libjava
+-clean-target: maybe-clean-target-zlib
+-clean-target: maybe-clean-target-boehm-gc
+-clean-target: maybe-clean-target-qthreads
+-clean-target: maybe-clean-target-rda
+-clean-target: maybe-clean-target-libada
+-clean-target: maybe-clean-target-libgomp
+ 
+ .PHONY: do-distclean
+ do-distclean:
+@@ -2237,27 +1990,8 @@ distclean-host: maybe-distclean-gnattools
 
 .PHONY: distclean-target
- distclean-target:  \
-    maybe-distclean-target-libstdc++-v3 \
-     maybe-distclean-target-newlib \
-    maybe-distclean-target-libf2c \
-    maybe-distclean-target-libobjc \
-    maybe-distclean-target-libtermcap \
-    maybe-distclean-target-winsup \
-    maybe-distclean-target-libgloss \
-    maybe-distclean-target-libiberty \
-    maybe-distclean-target-gperf \
-    maybe-distclean-target-examples \
-    maybe-distclean-target-libffi \
-    maybe-distclean-target-libjava \
-    maybe-distclean-target-zlib \
-    maybe-distclean-target-boehm-gc \
-    maybe-distclean-target-qthreads \
-    maybe-distclean-target-rda
 
- # GCC, the eternal special case
- .PHONY: maybe-distclean-gcc distclean-gcc
-@@ -15528,22 +15378,7 @@ maintainer-clean-host: maybe-maintainer-clean-gcc  \
+-distclean-target: maybe-distclean-target-libstdc++-v3
+-distclean-target: maybe-distclean-target-libmudflap
+-distclean-target: maybe-distclean-target-libssp
+ distclean-target: maybe-distclean-target-newlib
+ distclean-target: maybe-distclean-target-libgcc
+-distclean-target: maybe-distclean-target-libgfortran
+-distclean-target: maybe-distclean-target-libobjc
+-distclean-target: maybe-distclean-target-libtermcap
+-distclean-target: maybe-distclean-target-winsup
+-distclean-target: maybe-distclean-target-libgloss
+-distclean-target: maybe-distclean-target-libiberty
+-distclean-target: maybe-distclean-target-gperf
+-distclean-target: maybe-distclean-target-examples
+-distclean-target: maybe-distclean-target-libffi
+-distclean-target: maybe-distclean-target-libjava
+-distclean-target: maybe-distclean-target-zlib
+-distclean-target: maybe-distclean-target-boehm-gc
+-distclean-target: maybe-distclean-target-qthreads
+-distclean-target: maybe-distclean-target-rda
+-distclean-target: maybe-distclean-target-libada
+-distclean-target: maybe-distclean-target-libgomp
 
- .PHONY: maintainer-clean-target
- maintainer-clean-target:  \
-    maybe-maintainer-clean-target-libstdc++-v3 \
-     maybe-maintainer-clean-target-newlib \
-    maybe-maintainer-clean-target-libf2c \
-    maybe-maintainer-clean-target-libobjc \
-    maybe-maintainer-clean-target-libtermcap \
-    maybe-maintainer-clean-target-winsup \
-    maybe-maintainer-clean-target-libgloss \
-    maybe-maintainer-clean-target-libiberty \
-    maybe-maintainer-clean-target-gperf \
-    maybe-maintainer-clean-target-examples \
-    maybe-maintainer-clean-target-libffi \
-    maybe-maintainer-clean-target-libjava \
-    maybe-maintainer-clean-target-zlib \
-    maybe-maintainer-clean-target-boehm-gc \
-    maybe-maintainer-clean-target-qthreads \
-    maybe-maintainer-clean-target-rda
+ .PHONY: do-maintainer-clean
+ do-maintainer-clean:
+@@ -2511,27 +2245,8 @@ check-host:  \
 
- # GCC, the eternal special case
- .PHONY: maybe-maintainer-clean-gcc maintainer-clean-gcc
-@@ -17348,23 +17183,7 @@ do-check: maybe-check-gcc  \
-     maybe-check-tk \
-     maybe-check-tix \
-     maybe-check-libtermcap \
-    maybe-check-utils \
+ .PHONY: check-target
+ check-target:  \
 -    maybe-check-target-libstdc++-v3 \
+-    maybe-check-target-libmudflap \
+-    maybe-check-target-libssp \
     maybe-check-target-newlib \
-    maybe-check-target-libf2c \
+-    maybe-check-target-libgcc \
+-    maybe-check-target-libgfortran \
 -    maybe-check-target-libobjc \
 -    maybe-check-target-libtermcap \
 -    maybe-check-target-winsup \
@ -274,17 +418,23 @@ $OpenBSD: patch-Makefile_in,v 1.2 2007/10/05 13:14:13 sturm Exp $
 -    maybe-check-target-zlib \
 -    maybe-check-target-boehm-gc \
 -    maybe-check-target-qthreads \
-    maybe-check-target-rda
+-    maybe-check-target-rda \
+-    maybe-check-target-libada \
+-    maybe-check-target-libgomp
+    maybe-check-target-libgcc
 
- # Automated reporting of test results.
- 
-@@ -17528,22 +17347,7 @@ install-host: maybe-install-gcc  \
+ do-check:
+ 	@: $(MAKE); $(unstage)
+@@ -2724,27 +2439,8 @@ install-host:  \
 
 .PHONY: install-target
 install-target:  \
 -    maybe-install-target-libstdc++-v3 \
+-    maybe-install-target-libmudflap \
+-    maybe-install-target-libssp \
     maybe-install-target-newlib \
-    maybe-install-target-libf2c \
+-    maybe-install-target-libgcc \
+-    maybe-install-target-libgfortran \
 -    maybe-install-target-libobjc \
 -    maybe-install-target-libtermcap \
 -    maybe-install-target-winsup \
@ -297,7 +447,10 @@ $OpenBSD: patch-Makefile_in,v 1.2 2007/10/05 13:14:13 sturm Exp $
 -    maybe-install-target-zlib \
 -    maybe-install-target-boehm-gc \
 -    maybe-install-target-qthreads \
-    maybe-install-target-rda
+-    maybe-install-target-rda \
+-    maybe-install-target-libada \
+-    maybe-install-target-libgomp
+    maybe-install-target-libgcc
 
 uninstall:
 	@echo "the uninstall target is not supported in this tree"
--- a/devel/arm-elf/gcc/patches/patch-gcc_Makefile_in
+++ b/devel/arm-elf/gcc/patches/patch-gcc_Makefile_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_Makefile_in,v 1.2 2007/10/05 13:14:13 sturm Exp $
--- gcc/Makefile.in.orig	Thu Feb 24 10:26:57 2005
-+++ gcc/Makefile.in	Fri Oct  5 15:04:31 2007
-@@ -2963,12 +2963,7 @@ install-driver: installdirs xgcc$(exeext)
+$OpenBSD: patch-gcc_Makefile_in,v 1.3 2010/10/22 15:20:04 jasper Exp $
+--- gcc/Makefile.in.orig	Thu Oct 14 09:30:30 2010
+++ gcc/Makefile.in	Thu Oct 14 09:31:09 2010
+@@ -4185,13 +4185,7 @@ install-driver: installdirs xgcc$(exeext)
 # Install the info files.
 # $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir
 # to do the install.
@ -10,17 +10,9 @@ $OpenBSD: patch-gcc_Makefile_in,v 1.2 2007/10/05 13:14:13 sturm Exp $
 -	$(DESTDIR)$(infodir)/gcc.info \
 -	$(DESTDIR)$(infodir)/cppinternals.info \
 -	$(DESTDIR)$(infodir)/gccinstall.info \
-	$(DESTDIR)$(infodir)/gccint.info
+-	$(DESTDIR)$(infodir)/gccint.info \
+-	lang.install-info
 +install-info::
 
 $(DESTDIR)$(infodir)/%.info: doc/%.info installdirs
 	rm -f $@
-@@ -3139,8 +3134,6 @@ uninstall: lang.uninstall
- 	-rm -rf $(DESTDIR)$(man1dir)/cpp$(man1ext)
- 	-rm -rf $(DESTDIR)$(man1dir)/protoize$(man1ext)
- 	-rm -rf $(DESTDIR)$(man1dir)/unprotoize$(man1ext)
-	-rm -f $(DESTDIR)$(infodir)/cpp.info* $(DESTDIR)$(infodir)/gcc.info*
-	-rm -f $(DESTDIR)$(infodir)/cppinternals.info* $(DESTDIR)$(infodir)/gccint.info*
- #
- # These targets are for the dejagnu testsuites. The file site.exp
- # contains global variables that all the testsuites will use.
--- a/devel/arm-elf/gcc/patches/patch-gcc_config_arm_elf_h
+++ b/devel/arm-elf/gcc/patches/patch-gcc_config_arm_elf_h
@ -1,12 +1,12 @@
-$OpenBSD: patch-gcc_config_arm_elf_h,v 1.1 2007/10/05 13:14:13 sturm Exp $
--- gcc/config/arm/elf.h.orig	Fri Oct  5 15:05:10 2007
-+++ gcc/config/arm/elf.h	Fri Oct  5 15:05:42 2007
+$OpenBSD: patch-gcc_config_arm_elf_h,v 1.2 2010/10/22 15:20:04 jasper Exp $
+--- gcc/config/arm/elf.h.orig	Thu Oct 14 09:28:03 2010
+++ gcc/config/arm/elf.h	Thu Oct 14 09:30:16 2010
@@ -46,7 +46,7 @@
 
 #ifndef SUBTARGET_ASM_FLOAT_SPEC
 #define SUBTARGET_ASM_FLOAT_SPEC "\
-%{mapcs-float:-mfloat} %{msoft-float:-mfpu=softfpa}"
+-%{mapcs-float:-mfloat}"
 +%{mapcs-float:-mfloat} %{!mhard-float:-mfpu=softfpa} %{mhard-float:-mfpu=fpa}"
 #endif
 
- #ifndef ASM_SPEC
+ #undef SUBSUBTARGET_EXTRA_SPECS
--- a/devel/arm-elf/gcc/patches/patch-gcc_config_arm_t-arm-elf
+++ b/devel/arm-elf/gcc/patches/patch-gcc_config_arm_t-arm-elf
@ -1,16 +1,14 @@
-$OpenBSD: patch-gcc_config_arm_t-arm-elf,v 1.1.1.1 2007/04/02 15:35:01 sturm Exp $
--- gcc/config/arm/t-arm-elf.orig	Tue Sep 30 12:21:41 2003
-+++ gcc/config/arm/t-arm-elf	Sat Oct 14 18:06:38 2006
-@@ -26,9 +26,9 @@ MULTILIB_MATCHES     =
- # MULTILIB_DIRNAMES   += 32bit 26bit
- # MULTILIB_EXCEPTIONS += *mthumb/*mapcs-26*
+$OpenBSD: patch-gcc_config_arm_t-arm-elf,v 1.2 2010/10/22 15:20:04 jasper Exp $
+--- gcc/config/arm/t-arm-elf.orig	Thu Oct 14 09:25:43 2010
+++ gcc/config/arm/t-arm-elf	Thu Oct 14 09:26:52 2010
+@@ -40,8 +40,8 @@ MULTILIB_MATCHES     =
+ # MULTILIB_DIRNAMES   += fpu soft
+ # MULTILIB_EXCEPTIONS += *mthumb/*mhard-float*
 # 
 -# MULTILIB_OPTIONS    += mno-thumb-interwork/mthumb-interwork
 -# MULTILIB_DIRNAMES   += normal interwork
-# MULTILIB_EXCEPTIONS += *mapcs-26/*mthumb-interwork*
 +MULTILIB_OPTIONS    += mno-thumb-interwork/mthumb-interwork
 +MULTILIB_DIRNAMES   += normal interwork
-+MULTILIB_EXCEPTIONS += *mapcs-26/*mthumb-interwork*
 # 
 # MULTILIB_OPTIONS    += fno-leading-underscore/fleading-underscore
 # MULTILIB_DIRNAMES   += elf under
--- a/devel/arm-elf/gcc/patches/patch-gcc_config_arm_unknown-elf_h
+++ b/devel/arm-elf/gcc/patches/patch-gcc_config_arm_unknown-elf_h
@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_config_arm_unknown-elf_h,v 1.1.1.1 2007/04/02 15:35:01 sturm Exp $
--- gcc/config/arm/unknown-elf.h.orig	Tue Feb 24 15:25:22 2004
-+++ gcc/config/arm/unknown-elf.h	Sat Oct 14 18:06:38 2006
-@@ -46,7 +46,7 @@
+$OpenBSD: patch-gcc_config_arm_unknown-elf_h,v 1.2 2010/10/22 15:20:04 jasper Exp $
+--- gcc/config/arm/unknown-elf.h.orig	Fri Feb 20 16:20:38 2009
+++ gcc/config/arm/unknown-elf.h	Thu Oct 14 09:41:14 2010
+@@ -49,7 +49,7 @@
 #define SUBTARGET_CPP_SPEC  "-D__USES_INITFINI__"
 
 #undef  PREFERRED_DEBUGGING_TYPE
--- a/devel/arm-elf/gcc/patches/patch-libgcc_Makefile_in
+++ b/devel/arm-elf/gcc/patches/patch-libgcc_Makefile_in
@ -0,0 +1,38 @@
+$OpenBSD: patch-libgcc_Makefile_in,v 1.1 2010/10/22 15:20:04 jasper Exp $
+
+Using $(INSTALL_DATA) and chmod generates errors as the operation
+is not permitted. So use plain copy mode and chown/chgrp
+in the post-install target.
+
+--- libgcc/Makefile.in.orig	Thu Oct 14 11:39:34 2010
+++ libgcc/Makefile.in	Thu Oct 14 11:53:23 2010
+@@ -890,7 +890,7 @@ gcc-extra-parts:
+ 	parts="$(GCC_EXTRA_PARTS)";				\
+ 	for file in $$parts; do					\
+ 	  rm -f $(gcc_objdir)$(MULTISUBDIR)/$$file;		\
+-	  $(INSTALL_DATA) $$file $(gcc_objdir)$(MULTISUBDIR)/;	\
+	  install -c $$file $(gcc_objdir)$(MULTISUBDIR)/;	\
+ 	done
+ 
+ all: $(extra-parts)
+@@ -935,17 +935,15 @@ install-shared:
+ install-leaf: $(install-shared) $(install-libunwind)
+ 	$(mkinstalldirs) $(DESTDIR)$(inst_libdir)
+ 
+-	$(INSTALL_DATA) libgcc.a $(DESTDIR)$(inst_libdir)/
+-	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc.a
+	install -c libgcc.a $(DESTDIR)$(inst_libdir)/
+ 	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc.a
+-	$(INSTALL_DATA) libgcov.a $(DESTDIR)$(inst_libdir)/
+-	chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
+	install -c libgcov.a $(DESTDIR)$(inst_libdir)/
+ 	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
+ 
+ 	parts="$(INSTALL_PARTS)";				\
+ 	for file in $$parts; do					\
+ 	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
+-	  $(INSTALL_DATA) $$file $(DESTDIR)$(inst_libdir)/;	\
+	  install -c $$file $(DESTDIR)$(inst_libdir)/;	\
+ 	done
+ 
+ install: install-leaf
--- a/devel/arm-elf/gcc/patches/patch-libiberty_Makefile_in
+++ b/devel/arm-elf/gcc/patches/patch-libiberty_Makefile_in
@ -1,12 +1,12 @@
-$OpenBSD: patch-libiberty_Makefile_in,v 1.2 2007/10/05 13:14:13 sturm Exp $
--- libiberty/Makefile.in.orig	Wed Jan 14 22:27:28 2004
-+++ libiberty/Makefile.in	Fri Oct  5 15:04:31 2007
-@@ -267,7 +267,7 @@ libiberty.html : $(srcdir)/libiberty.texi $(TEXISRC)
+$OpenBSD: patch-libiberty_Makefile_in,v 1.3 2010/10/22 15:20:04 jasper Exp $
+--- libiberty/Makefile.in.orig	Wed Oct 22 15:30:19 2008
+++ libiberty/Makefile.in	Thu Oct 14 09:41:14 2010
+@@ -346,7 +346,7 @@ libiberty.html : $(srcdir)/libiberty.texi $(TEXISRC)
 @MAINT@	echo stamp > stamp-functions
 
 INSTALL_DEST = @INSTALL_DEST@
 -install: install_to_$(INSTALL_DEST) install-subdir
 +install:
 
- install_to_libdir: all
- 	${mkinstalldirs} $(DESTDIR)$(libdir)$(MULTISUBDIR)
+ # This is tricky.  Even though CC in the Makefile contains
+ # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
--- a/devel/arm-elf/gcc/pkg/PLIST
+++ b/devel/arm-elf/gcc/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2010/10/14 09:58:37 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.4 2010/10/22 15:20:04 jasper Exp $
 arm-elf/
 arm-elf/lib/
@bin bin/arm-elf-c++
@ -15,30 +15,28 @@ lib/gcc/arm-elf/${VERSION}/crtend.o
 lib/gcc/arm-elf/${VERSION}/crti.o
 lib/gcc/arm-elf/${VERSION}/crtn.o
 lib/gcc/arm-elf/${VERSION}/include/
-lib/gcc/arm-elf/${VERSION}/include/README
+lib/gcc/arm-elf/${VERSION}/include-fixed/
+lib/gcc/arm-elf/${VERSION}/include-fixed/README
+lib/gcc/arm-elf/${VERSION}/include-fixed/limits.h
+lib/gcc/arm-elf/${VERSION}/include-fixed/syslimits.h
+lib/gcc/arm-elf/${VERSION}/include/arm_neon.h
 lib/gcc/arm-elf/${VERSION}/include/float.h
 lib/gcc/arm-elf/${VERSION}/include/iso646.h
-lib/gcc/arm-elf/${VERSION}/include/limits.h
 lib/gcc/arm-elf/${VERSION}/include/mmintrin.h
 lib/gcc/arm-elf/${VERSION}/include/stdarg.h
 lib/gcc/arm-elf/${VERSION}/include/stdbool.h
 lib/gcc/arm-elf/${VERSION}/include/stddef.h
-lib/gcc/arm-elf/${VERSION}/include/syslimits.h
+lib/gcc/arm-elf/${VERSION}/include/stdfix.h
+lib/gcc/arm-elf/${VERSION}/include/tgmath.h
 lib/gcc/arm-elf/${VERSION}/include/unwind.h
 lib/gcc/arm-elf/${VERSION}/include/varargs.h
 lib/gcc/arm-elf/${VERSION}/install-tools/
+lib/gcc/arm-elf/${VERSION}/install-tools/fixinc_list
 lib/gcc/arm-elf/${VERSION}/install-tools/gsyslimits.h
 lib/gcc/arm-elf/${VERSION}/install-tools/include/
 lib/gcc/arm-elf/${VERSION}/install-tools/include/README
-lib/gcc/arm-elf/${VERSION}/install-tools/include/float.h
-lib/gcc/arm-elf/${VERSION}/install-tools/include/iso646.h
 lib/gcc/arm-elf/${VERSION}/install-tools/include/limits.h
-lib/gcc/arm-elf/${VERSION}/install-tools/include/mmintrin.h
-lib/gcc/arm-elf/${VERSION}/install-tools/include/stdarg.h
-lib/gcc/arm-elf/${VERSION}/install-tools/include/stdbool.h
-lib/gcc/arm-elf/${VERSION}/install-tools/include/stddef.h
-lib/gcc/arm-elf/${VERSION}/install-tools/include/unwind.h
-lib/gcc/arm-elf/${VERSION}/install-tools/include/varargs.h
+lib/gcc/arm-elf/${VERSION}/install-tools/macro_list
 lib/gcc/arm-elf/${VERSION}/install-tools/mkheaders.conf
 lib/gcc/arm-elf/${VERSION}/interwork/
 lib/gcc/arm-elf/${VERSION}/interwork/crtbegin.o
@ -49,7 +47,6 @@ lib/gcc/arm-elf/${VERSION}/interwork/libgcc.a
 lib/gcc/arm-elf/${VERSION}/interwork/libgcov.a
 lib/gcc/arm-elf/${VERSION}/libgcc.a
 lib/gcc/arm-elf/${VERSION}/libgcov.a
-lib/gcc/arm-elf/${VERSION}/specs
 lib/gcc/arm-elf/${VERSION}/thumb/
 lib/gcc/arm-elf/${VERSION}/thumb/crtbegin.o
 lib/gcc/arm-elf/${VERSION}/thumb/crtend.o
@ -74,6 +71,7 @@ libexec/gcc/arm-elf/${VERSION}/install-tools/
 libexec/gcc/arm-elf/${VERSION}/install-tools/fixinc.sh
@bin libexec/gcc/arm-elf/${VERSION}/install-tools/fixincl
 libexec/gcc/arm-elf/${VERSION}/install-tools/mkheaders
+libexec/gcc/arm-elf/${VERSION}/install-tools/mkinstalldirs
@man man/man1/arm-elf-cpp.1
@man man/man1/arm-elf-g++.1
@man man/man1/arm-elf-gcc.1