diff --git a/srcpkgs/cross-arm-linux-gnueabihf-libc b/srcpkgs/cross-arm-linux-gnueabihf-libc
new file mode 120000
index 00000000000..f2a8f7117d4
--- /dev/null
+++ b/srcpkgs/cross-arm-linux-gnueabihf-libc
@@ -0,0 +1 @@
+cross-arm-linux-gnueabihf
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/cross-arm-linux-gnueabihf-libc.template b/srcpkgs/cross-arm-linux-gnueabihf/cross-arm-linux-gnueabihf-libc.template
new file mode 100644
index 00000000000..315f9119fa5
--- /dev/null
+++ b/srcpkgs/cross-arm-linux-gnueabihf/cross-arm-linux-gnueabihf-libc.template
@@ -0,0 +1,11 @@
+# Template file for 'cross-arm-linux-gnueabihf-libc'.
+#
+short_desc="${short_desc} -- glibc files"
+
+noarch=yes
+nostrip=yes
+noverifydeps=yes
+
+do_install() {
+	vmove usr/${_CROSS_TARGET} usr
+}
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/files/armhf-triplet-trunk.diff b/srcpkgs/cross-arm-linux-gnueabihf/files/armhf-triplet-trunk.diff
new file mode 100644
index 00000000000..251e9b0ea1e
--- /dev/null
+++ b/srcpkgs/cross-arm-linux-gnueabihf/files/armhf-triplet-trunk.diff
@@ -0,0 +1,110 @@
+diff -urN a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
+--- a/gcc/ada/gcc-interface/Makefile.in	2012-06-12 09:12:37.000000000 -0600
++++ b/gcc/ada/gcc-interface/Makefile.in	2012-07-06 19:53:20.740322776 -0600
+@@ -1867,7 +1867,7 @@
+   LIBRARY_VERSION := $(LIB_VERSION)
+ endif
+ 
+-ifeq ($(strip $(filter-out arm% linux-gnueabi,$(arch) $(osys)-$(word 4,$(targ)))),)
++ifeq ($(strip $(filter-out arm%-linux,$(arch)-$(osys)) $(if $(findstring eabi,$(word 4,$(targ))),,$(word 4,$(targ)))),)
+   LIBGNAT_TARGET_PAIRS = \
+   a-intnam.ads<a-intnam-linux.ads \
+   s-inmaop.adb<s-inmaop-posix.adb \
+diff -urN a/gcc/config.gcc b/gcc/config.gcc
+--- a/gcc/config.gcc	2012-06-04 03:51:00.000000000 -0600
++++ b/gcc/config.gcc	2012-07-06 19:53:20.724697276 -0600
+@@ -842,7 +842,7 @@
+ 	esac
+ 	tmake_file="${tmake_file} arm/t-arm"
+ 	case ${target} in
+-	arm*-*-linux-*eabi)
++	arm*-*-linux-*eabi*)
+ 	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
+ 	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
+ 	    # Define multilib configuration for arm-linux-androideabi.
+@@ -869,7 +869,7 @@
+ 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/linux-gas.h arm/uclinux-elf.h glibc-stdint.h"
+ 	tmake_file="arm/t-arm arm/t-arm-elf"
+ 	case ${target} in
+-	arm*-*-uclinux*eabi)
++	arm*-*-uclinux*eabi*)
+ 	    tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
+ 	    tmake_file="$tmake_file arm/t-bpabi"
+   	    # The BPABI long long divmod functions return a 128-bit value in
+diff -urN a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
+--- a/gcc/testsuite/lib/target-supports.exp	2012-04-09 03:24:22.000000000 -0600
++++ b/gcc/testsuite/lib/target-supports.exp	2012-07-06 19:53:20.732510026 -0600
+@@ -3840,7 +3840,7 @@
+ 	     || [istarget i?86-*-*]
+ 	     || [istarget x86_64-*-*]
+ 	     || [istarget alpha*-*-*] 
+-	     || [istarget arm*-*-linux-gnueabi] 
++	     || [istarget arm*-*-linux-*eabi*] 
+ 	     || [istarget bfin*-*linux*]
+ 	     || [istarget hppa*-*linux*]
+ 	     || [istarget s390*-*-*] 
+@@ -3870,7 +3870,7 @@
+ 	     || [istarget i?86-*-*]
+ 	     || [istarget x86_64-*-*]
+ 	     || [istarget alpha*-*-*] 
+-	     || [istarget arm*-*-linux-gnueabi] 
++	     || [istarget arm*-*-linux-*eabi*] 
+ 	     || [istarget hppa*-*linux*]
+ 	     || [istarget s390*-*-*] 
+ 	     || [istarget powerpc*-*-*]
+diff -urN a/libgcc/config.host b/libgcc/config.host
+--- a/libgcc/config.host	2012-04-30 11:39:57.000000000 -0600
++++ b/libgcc/config.host	2012-07-06 19:53:20.787199276 -0600
+@@ -327,7 +327,7 @@
+ arm*-*-linux*)			# ARM GNU/Linux with ELF
+ 	tmake_file="${tmake_file} arm/t-arm t-fixedpoint-gnu-prefix"
+ 	case ${host} in
+-	arm*-*-linux-*eabi)
++	arm*-*-linux-*eabi*)
+ 	  tmake_file="${tmake_file} arm/t-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
+ 	  tm_file="$tm_file arm/bpabi-lib.h"
+ 	  unwind_header=config/arm/unwind-arm.h
+diff -urN a/libjava/configure.ac b/libjava/configure.ac
+--- a/libjava/configure.ac	2012-05-21 12:14:01.000000000 -0600
++++ b/libjava/configure.ac	2012-07-06 19:53:20.709071776 -0600
+@@ -931,7 +931,7 @@
+     # on Darwin -single_module speeds up loading of the dynamic libraries.
+     extra_ldflags_libjava=-Wl,-single_module
+     ;;
+-arm*linux*eabi)
++arm*-*-linux-*eabi*)
+     # Some of the ARM unwinder code is actually in libstdc++.  We
+     # could in principle replicate it in libgcj, but it's better to
+     # have a dependency on libstdc++.
+diff -urN a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
+--- a/libstdc++-v3/configure.host	2012-02-10 11:10:12.000000000 -0700
++++ b/libstdc++-v3/configure.host	2012-07-06 19:53:20.748135526 -0600
+@@ -340,7 +340,7 @@
+         fi
+     esac
+     case "${host}" in
+-      arm*-*-linux-*eabi)
++      arm*-*-linux-*eabi*)
+ 	port_specific_symbol_files="\$(srcdir)/../config/os/gnu-linux/arm-eabi-extra.ver"
+ 	;;
+     esac
+diff -urN a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc
+--- a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc	2011-09-21 05:23:11.000000000 -0600
++++ b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc	2012-07-06 19:53:20.771573776 -0600
+@@ -1,5 +1,5 @@
+ // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
+-// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux-*eabi* } }
+ 
+ // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
+ //
+diff -urN a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc
+--- a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc	2011-09-21 05:23:11.000000000 -0600
++++ b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc	2012-07-06 19:53:20.763761026 -0600
+@@ -1,5 +1,5 @@
+ // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
+-// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux-*eabi* } }
+ 
+ // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
+ //
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
new file mode 100644
index 00000000000..b936a27d208
--- /dev/null
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -0,0 +1,354 @@
+# Template build file for 'cross-arm-linux-gnueabihf'
+#
+_binutils_version=2.23.1
+_gcc_version=4.7.2
+_glibc_version=2.17
+_gmp_version=5.0.5
+_mpfr_version=3.1.1
+
+pkgname=cross-arm-linux-gnueabihf
+version=0.1
+revision=1
+short_desc="Cross toolchain for the arm-linux-gnueabihf target"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://www.voidlinux.eu"
+license="Public Domain"
+distfiles="
+ http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}/binutils-${_binutils_version}.tar.bz2
+ http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2
+ http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz
+ http://mirrors.kernel.org/gnu/gmp/gmp-${_gmp_version}.tar.bz2
+ http://www.mpfr.org/mpfr-current/mpfr-${_mpfr_version}.tar.bz2"
+checksum="
+ 2ab2e5b03e086d12c6295f831adad46b3e1410a3a234933a2e8fac66cb2e7a19
+ 8a9283d7010fb9fe5ece3ca507e0af5c19412626384f8a5e9434251ae100b084
+ 6914e337401e0e0ade23694e1b2c52a5f09e4eda3270c67e7c3ba93a89b5b23e
+ 1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9
+ 7b66c3f13dc8385f08264c805853f3e1a8eedab8071d582f3e661971c9acd5fd"
+
+nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
+create_wrksrc=yes
+disable_debug=yes
+subpackages="${pkgname}-libc"
+makedepends="perl flex gmp-devel mpc-devel cloog-ppl-devel
+ cross-arm-linux-gnueabihf-libc-headers-3.7.1_2"
+depends="${pkgname}-libc-headers ${pkgname}-libc-${version}_${revision}"
+
+_CROSS_TARGET="arm-linux-gnueabihf"
+_CROSS_DIR="/usr"
+_CROSS_SYSROOT="${_CROSS_DIR}/${_CROSS_TARGET}"
+
+_apply_patch() {
+	local pname="$(basename $1)"
+
+	if [ ! -f ".${pname}_done" ]; then
+		patch -Np1 -i ${1}
+		touch .${pname}_done
+	fi
+}
+
+_binutils_bootstrap() {
+	[ -f ${wrksrc}/.binutils_bootstrap_done ] && return 0
+
+	cd ${wrksrc}
+	msg_normal "Building cross binutils bootstrap\n"
+	[ ! -d binutils-build ] && mkdir binutils-build
+	cd binutils-build
+
+	../binutils-${_binutils_version}/configure \
+		--prefix=${_CROSS_DIR} --target=${_CROSS_TARGET} \
+		--with-sysroot=${_CROSS_SYSROOT} --disable-nls --disable-shared \
+		--disable-multilib --disable-werror || return 1
+
+	make configure-host && make ${makejobs} || return 1
+	make install || return 1
+
+	touch ${wrksrc}/.binutils_bootstrap_done
+}
+
+_gcc_bootstrap() {
+	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
+
+	cd ${wrksrc}
+	msg_normal "Building cross gcc bootstrap\n"
+
+	cd gcc-${_gcc_version}
+	_apply_patch ${FILESDIR}/armhf-triplet-trunk.diff
+
+	[ ! -d ../gcc-build ] && mkdir ../gcc-build
+	cd ../gcc-build
+
+	../gcc-${_gcc_version}/configure --prefix=${_CROSS_DIR} \
+		--target=${_CROSS_TARGET} --without-headers \
+		--disable-nls --disable-shared --without-headers \
+		--disable-decimal-float --disable-libgomp --disable-libmudflap \
+		--disable-libssp --disable-threads --enable-languages=c \
+		--disable-sjlj-exceptions --disable-multilib \
+		--with-gnu-ld --with-gnu-as --with-float=hard
+
+	make ${makejobs} all-gcc all-target-libgcc || return 1
+	make install-gcc install-target-libgcc || return 1
+
+	ln -sfr ${_CROSS_DIR}/lib/gcc/${_CROSS_TARGET}/${_gcc_version}/libgcc.a \
+		${_CROSS_DIR}/lib/gcc/${_CROSS_TARGET}/${_gcc_version}/libgcc_sh.a
+
+	touch ${wrksrc}/.gcc_bootstrap_done
+}
+
+_glibc_headers() {
+	[ -f ${wrksrc}/.glibc_headers_done ] && return 0
+
+	cd ${wrksrc}
+	msg_normal "Building cross glibc headers\n"
+
+	[ ! -d glibc-headers ] && mkdir glibc-headers
+	cd glibc-headers
+
+	echo "libc_cv_forced_unwind=yes" > config.cache
+	echo "libc_cv_c_cleanup=yes" >> config.cache
+
+	export CC="${_CROSS_TARGET}-gcc" LD="${_CROSS_TARGET}-ld" AS="${_CROSS_TARGET}-as"
+	export PATH=${_CROSS_DIR}/bin:${PATH}
+
+	../glibc-${_glibc_version}/configure \
+		--host=${_CROSS_TARGET} --prefix=/usr \
+		--with-headers=/usr/${_CROSS_TARGET}/usr/include \
+		--config-cache --enable-add-ons=nptl,ports \
+		--enable-kernel=2.6.27 --with-float=hard || return 1
+
+	make -k install-headers cross_compiling=yes \
+		install_root=${_CROSS_SYSROOT} || return 1
+
+	touch ${wrksrc}/.glibc_headers_done
+}
+
+_glibc_build() {
+	[ -f ${wrksrc}/.glibc_build_done ] && return 0
+
+	cd ${wrksrc}
+	msg_normal "Building cross glibc\n"
+
+	[ ! -d glibc-build ] && mkdir glibc-build
+	cd glibc-build
+
+	echo "libc_cv_forced_unwind=yes" > config.cache
+	echo "libc_cv_c_cleanup=yes" >> config.cache
+
+	export CC="${_CROSS_TARGET}-gcc" LD="${_CROSS_TARGET}-ld" AS="${_CROSS_TARGET}-as"
+	export CFLAGS="-Os -pipe -mfloat-abi=hard -mfpu=vfp -march=armv6"
+
+	../glibc-${_glibc_version}/configure \
+		--host=${_CROSS_TARGET} --prefix=/usr \
+		--with-headers=/usr/${_CROSS_TARGET}/usr/include \
+		--config-cache --enable-add-ons=nptl,ports \
+		--with-float=hard --enable-kernel=2.6.27
+	
+	make ${makejobs} || return 1
+	make install_root=${_CROSS_SYSROOT} install || return 1
+
+	touch ${wrksrc}/.glibc_build_done
+}
+
+_gcc_static() {
+	[ -f ${wrksrc}/.gcc_static_done ] && return 0
+
+	cd ${wrksrc}
+	msg_normal "Building cross gcc static\n"
+
+	[ ! -d gcc-static ] && mkdir gcc-static
+	cd gcc-static
+
+	echo "libc_cv_forced_unwind=yes" > config.cache
+	echo "libc_cv_c_cleanup=yes" >>config.cache
+
+	export CC="gcc"
+	export CFLAGS="-Os"
+
+	../gcc-${_gcc_version}/configure \
+		--target=${_CROSS_TARGET} --prefix=${_CROSS_DIR} \
+		--with-sysroot=${_CROSS_SYSROOT} --enable-languages=c \
+		--with-gnu-as --with-gnu-ld --disable-multilib \
+		--with-float=hard --disable-sjlj-exceptions --disable-nls \
+		--enable-threads=posix --enable-long-longx || return 1
+
+	make ${makejobs} all-gcc || return 1
+	make install-gcc || return 1
+
+	ln -sfr ${_CROSS_DIR}/lib/gcc/${_CROSS_TARGET}/${_gcc_version}/libgcc.a \
+		${_CROSS_DIR}/lib/gcc/${_CROSS_TARGET}/${_gcc_version}/libgcc_eh.a
+
+	touch ${wrksrc}/.gcc_static_done
+}
+
+_gmp_static() {
+	[ -f ${wrksrc}/.gmp_static_done ] && return 0
+
+	cd ${wrksrc}
+	msg_normal "Building cross gmp static\n"
+
+	[ ! -d gmp-static ] && mkdir gmp-static
+	cd gmp-static
+
+	export CC="${_CROSS_TARGET}-gcc" LD="${_CROSS_TARGET}-ld" AS="${_CROSS_TARGET}-as"
+	export CFLAGS="-Os -pipe -mfloat-abi=hard -mfpu=vfp -march=armv6 -static"
+
+	../gmp-${_gmp_version}/configure \
+		--host=${_CROSS_TARGET} --prefix=${_CROSS_SYSROOT} \
+		--disable-shared || return 1
+
+	make ${makejobs} || return 1
+	make install || return 1
+
+	touch ${wrksrc}/.gmp_static_done
+}
+
+_mpfr_build() {
+	[ -f ${wrksrc}/.mpfr_build_done ] && return 0
+
+	cd ${wrksrc}
+	msg_normal "Building cross mpfr\n"
+
+	[ ! -d mpfr-build ] && mkdir mpfr-build
+	cd mpfr-build
+
+	export CC="${_CROSS_TARGET}-gcc" LD="${_CROSS_TARGET}-ld" AS="${_CROSS_TARGET}-as"
+	export CFLAGS="-Os -pipe -mfloat-abi=hard -mfpu=vfp -march=armv6"
+
+	../mpfr-${_mpfr_version}/configure \
+		--host=${_CROSS_TARGET} --prefix=${_CROSS_SYSROOT} \
+		--with-gmp=${_CROSS_SYSROOT} || return 1
+
+	make ${makejobs} || return 1
+	make install || return 1
+
+	touch ${wrksrc}/.mpfr_build_done
+}
+
+_gcc_final() {
+	[ -f ${wrksrc}/.gcc_final_done ] && return 0
+
+	cd ${wrksrc}
+	msg_normal "Building cross gcc final\n"
+
+	[ ! -d gcc-final ] && mkdir gcc-final
+	cd gcc-final
+
+	# XXX
+	ln -sfr ${_CROSS_SYSROOT}/usr/include/gnu/stubs-hard.h \
+		${_CROSS_SYSROOT}/usr/include/gnu/stubs-soft.h
+
+	export CC="gcc"
+	# Make this link to target libs.
+	if [ ! -f .sed_subst_done ]; then
+		sed -e "s, /lib/, ${_CROSS_SYSROOT}/lib/,g;s, /usr/lib/, ${_CROSS_SYSROOT}/usr/lib/,g" \
+			-i ${_CROSS_SYSROOT}/lib/libc.so ${_CROSS_SYSROOT}/lib/libpthread.so
+		touch .sed_subst_done
+	fi
+	
+	../gcc-${_gcc_version}/configure \
+		--target=${_CROSS_TARGET} --prefix=/usr \
+		--with-sysroot=${_CROSS_SYSROOT} --enable-languages=c,c++ \
+		--with-gnu-as --with-gnu-ld --disable-multilib \
+		--with-float=hard --disable-nls --disable-sjlj-exceptions \
+		--enable-threads=posix --enable-long-longx \
+		--enable-shared || return 1
+
+	make ${makejobs} || return 1
+	make install || return 1
+
+	touch ${wrksrc}/.gcc_final_done
+}
+
+_glibc_final() {
+	[ -f ${wrksrc}/.glibc_final_done ] && return 0
+
+	cd ${wrksrc}
+	msg_normal "Building final glibc for target\n"
+
+	[ ! -d glibc-final ] && mkdir glibc-final
+	cd glibc-final
+
+	echo "libc_cv_forced_unwind=yes" > config.cache
+	echo "libc_cv_c_cleanup=yes" >> config.cache
+
+	export CC="${_CROSS_TARGET}-gcc" LD="${_CROSS_TARGET}-ld" AS="${_CROSS_TARGET}-as"
+	export CFLAGS="-Os -pipe -mfloat-abi=hard -mfpu=vfp -march=armv6"
+
+	../glibc-${_glibc_version}/configure \
+		--host=${_CROSS_TARGET} --prefix=/usr \
+		--with-headers=/usr/${_CROSS_TARGET}/usr/include \
+		--config-cache --enable-add-ons=nptl,ports \
+		--with-float=hard --enable-kernel=2.6.27
+	
+	make ${makejobs} || return 1
+
+	touch ${wrksrc}/.glibc_final_done
+}
+
+do_build() {
+	unset LDFLAGS
+	export CFLAGS="-Os" CXXFLAGS="-Os"
+
+	for f in include lib libexec bin sbin; do
+		if [ ! -d ${_CROSS_SYSROOT}/usr/${f} ]; then
+			mkdir -p ${_CROSS_SYSROOT}/usr/${f}
+			ln -sfr ${_CROSS_SYSROOT}/usr/${f} ${_CROSS_SYSROOT}/${f}
+		fi
+	done
+
+	_binutils_bootstrap || return 1
+	_gcc_bootstrap || return 1
+	_glibc_headers || return 1
+	_glibc_build || return 1
+	_gcc_static || return 1
+	_gmp_static || return 1
+	_mpfr_build || return 1
+	_gcc_final || return 1
+	_glibc_final || return 1
+}
+
+do_install() {
+	for f in include lib libexec bin sbin; do
+		if [ ! -d ${DESTDIR}/${_CROSS_SYSROOT}/usr/${f} ]; then
+			mkdir -p ${DESTDIR}/${_CROSS_SYSROOT}/usr/${f}
+			ln -sfr ${DESTDIR}/${_CROSS_SYSROOT}/usr/${f} \
+				${DESTDIR}/${_CROSS_SYSROOT}/${f}
+		fi
+	done
+
+	# install cross binutils
+	cd ${wrksrc}/binutils-build &&
+		make DESTDIR=${DESTDIR} install || return 1
+
+	# install cross gcc
+	cd ${wrksrc}/gcc-final && \
+		make DESTDIR=${DESTDIR} install || return 1
+
+	# install glibc for target
+	cd ${wrksrc}/glibc-final && \
+		make install_root=${DESTDIR}/usr/${_CROSS_TARGET} install || return 1
+
+	# hard-float only toolchain.
+	ln -sfr ${DESTDIR}/${_CROSS_SYSROOT}/usr/include/gnu/stubs-hard.h \
+		${DESTDIR}/${_CROSS_SYSROOT}/usr/include/gnu/stubs-soft.h
+
+	# Remove unnecessary stuff
+	rm -f ${DESTDIR}/usr/lib*/libiberty.a
+	rm -rf ${DESTDIR}/usr/share
+	rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/{etc,var}
+	rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/usr/{sbin,share,libexec}
+	rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/usr/lib/gconv
+	rm -f ${DESTDIR}/${_CROSS_SYSROOT}/libexec
+
+	for f in sprof localedef gencat pldd sotruss tzselect iconv mtrace \
+		catchsegv xtrace makedb pcprofiledump locale rpcgen getconf \
+		getent ldd; do
+		rm -f ${DESTDIR}/${_CROSS_SYSROOT}/usr/bin/${f}
+	done
+
+	# Remove temporary stuff from masterdir
+	rm -rf ${_CROSS_SYSROOT}
+	rm -f /usr/bin/${_CROSS_TARGET}*
+	rm -rf /usr/lib/gcc/${_CROSS_TARGET}
+	rm -rf /usr/libexec/gcc/${_CROSS_TARGET}
+}