Fix sparc64/mips64 symlinks to point to /usr/sparc-*/bin/*. Do not apply

-ppc-reloc.patch to sparc as ld quits with SIGBUS.

10 files changed, 266 insertions, 27 deletions

diff --git a/sys-devel/binutils/ChangeLog b/sys-devel/binutils/ChangeLog
index 153f3ecf7c6c..fc83c2b612f3 100644
--- a/sys-devel/binutils/ChangeLog
+++ b/sys-devel/binutils/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-devel/binutils
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/ChangeLog,v 1.90 2003/11/09 01:44:45 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/ChangeLog,v 1.91 2003/11/09 15:43:16 azarah Exp $
+
+*binutils-2.14.90.0.7-r3 (09 Nov 2003)
+
+  09 Nov 2003; Martin Schlemmer <azarah@gentoo.org>
+  binutils-2.14.90.0.2.ebuild, binutils-2.14.90.0.4.1-r1.ebuild,
+  binutils-2.14.90.0.6-r7.ebuild, binutils-2.14.90.0.7-r1.ebuild,
+  binutils-2.14.90.0.7-r2.ebuild, binutils-2.14.90.0.7-r3.ebuild,
+  binutils-2.14.90.0.7.ebuild:
+  Fix sparc64/mips64 symlinks to point to /usr/sparc-*/bin/*. Do not apply
+  -ppc-reloc.patch to sparc as ld quits with SIGBUS.
 
   08 Nov 2003; Jason Wever <weeve@gentoo.org> binutils-2.14.90.0.7-r2.ebuild:
   Masked on sparc until ld issue is fixed.
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index f274379a4b4f..99cd149afa4a 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -1,19 +1,19 @@
 MD5 180a5724a39c60a76cce5d23a40b23f7 binutils-2.13.90.0.18-r1.ebuild 5367
-MD5 5d328c8a90aa595cde0ab49110447bb4 binutils-2.14.90.0.2.ebuild 5671
-MD5 c37f7e114efdac9e7fe8620fb7bacef1 binutils-2.14.90.0.7-r2.ebuild 6163
+MD5 ddc5c538af148b84fa478756f468acaa binutils-2.14.90.0.2.ebuild 5671
+MD5 17ceeea7ab368d305a902f688acd3e77 binutils-2.14.90.0.7-r2.ebuild 6164
 MD5 3b3bb8e5916c0d12da07c5bfeb5d09cf binutils-2.14.90.0.6-r2.ebuild 5602
 MD5 e56840c0286c1b40a114e80ced64dc45 binutils-2.13.90.0.18.ebuild 4572
 MD5 bc3f212a30ea4168eaf3b97df6d552ac binutils-2.14.90.0.6-r3.ebuild 6018
-MD5 5954f8c1e7f41d8dade7a5c8b03cbff2 binutils-2.14.90.0.7-r1.ebuild 5618
+MD5 6254c40f0b3984cc8c86c39de84af9bb binutils-2.14.90.0.7-r1.ebuild 5618
 MD5 b7ddfee30d6b7884c1b9088c6fde759d binutils-2.13.90.0.16-r1.ebuild 4661
 MD5 1b11085f74185bfe7061a6fb01d62ebd binutils-2.12.90.0.15.ebuild 3501
-MD5 ca9cdac031527ce5cf84e1659a18ad2f ChangeLog 19956
-MD5 6b1b7ec4d984b6ae5e4dba6ea1970465 binutils-2.14.90.0.6-r7.ebuild 6744
+MD5 d5ea3795c4d9552adfcd253a7a92cadd ChangeLog 20406
+MD5 b62d86b06c39b4cb33bae82bcf813086 binutils-2.14.90.0.6-r7.ebuild 6741
 MD5 b7db6fb32b4653b2832c60bc12dce7a1 binutils-2.11.92.0.7.ebuild 2325
 MD5 0605cad192892662d9ab7bcf4292a278 binutils-2.11.92.0.12.3-r2.ebuild 3047
-MD5 662b167d2b0cd9d333d22f7139a06a17 binutils-2.14.90.0.4.1-r1.ebuild 6629
-MD5 280efd2d85f6613893fce7ebfc136f21 binutils-2.14.90.0.7-r3.ebuild 6191
-MD5 963c7a3da30af0d2e5e7396665a0975c binutils-2.14.90.0.7.ebuild 5569
+MD5 811e3501297229b9c457f03dca3e3098 binutils-2.14.90.0.4.1-r1.ebuild 6629
+MD5 c215c3c613ba2cad3000078be2d4e1d4 binutils-2.14.90.0.7-r3.ebuild 6192
+MD5 3bd4365800eff544e9f4865924d7ccfb binutils-2.14.90.0.7.ebuild 5569
 MD5 92e0fa5133dbba4ffefc25a217f28686 binutils-2.14.90.0.5-r1.ebuild 5781
 MD5 9bcea11a247790647c9ecda3b499c218 binutils-2.14.90.0.6-r6.ebuild 6645
 MD5 3b32997c2ca6b9893839c439e077e82d files/digest-binutils-2.14.90.0.6-r2 75
diff --git a/sys-devel/binutils/binutils-2.14.90.0.2.ebuild b/sys-devel/binutils/binutils-2.14.90.0.2.ebuild
index 547db7a748ce..f658d5799c2f 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.2.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.2.ebuild,v 1.12 2003/11/03 23:30:36 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.2.ebuild,v 1.13 2003/11/09 15:43:16 azarah Exp $
 
 IUSE="nls bootstrap build"
 
@@ -153,9 +153,11 @@ src_install() {
 	then
 		dosym ${CHOST} /usr/${CHOST/-/64-}
 
-		for x in `ls ${D}/usr/${CHOST/-/64-}/bin/`
+		for x in `ls ${D}/usr/${CHOST}/bin/`
 		do
-			dosym ../${CHOST/-/64-}/bin/${x} /usr/bin/${CHOST/-/64-}-${x}
+			[ ! -e "${D}/usr/bin/${CHOST}-${x}" ] && \
+				dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST}-${x}
+			dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST/-/64-}-${x}
 		done
 	fi
 
diff --git a/sys-devel/binutils/binutils-2.14.90.0.4.1-r1.ebuild b/sys-devel/binutils/binutils-2.14.90.0.4.1-r1.ebuild
index 8f35c5969343..d57923c74840 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.4.1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.4.1-r1.ebuild,v 1.5 2003/11/03 23:30:36 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.4.1-r1.ebuild,v 1.6 2003/11/09 15:43:16 azarah Exp $
 
 IUSE="nls bootstrap build"
 
@@ -177,9 +177,11 @@ src_install() {
 	then
 		dosym ${CHOST} /usr/${CHOST/-/64-}
 
-		for x in `ls ${D}/usr/${CHOST/-/64-}/bin/`
+		for x in `ls ${D}/usr/${CHOST}/bin/`
 		do
-			dosym ../${CHOST/-/64-}/bin/${x} /usr/bin/${CHOST/-/64-}-${x}
+			[ ! -e "${D}/usr/bin/${CHOST}-${x}" ] && \
+				dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST}-${x}
+			dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST/-/64-}-${x}
 		done
 	fi
 
diff --git a/sys-devel/binutils/binutils-2.14.90.0.6-r7.ebuild b/sys-devel/binutils/binutils-2.14.90.0.6-r7.ebuild
index 4f0fdb77b2e4..6b1f48a9ed4c 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.6-r7.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.6-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.6-r7.ebuild,v 1.3 2003/11/05 00:50:16 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.6-r7.ebuild,v 1.4 2003/11/09 15:43:16 azarah Exp $
 
 IUSE="nls bootstrap build"
 
@@ -185,9 +185,11 @@ src_install() {
 	then
 		dosym ${CHOST} /usr/${CHOST/-/64-}
 
-		for x in `ls ${D}/usr/${CHOST/-/64-}/bin/`
+		for x in `ls ${D}/usr/${CHOST}/bin/`
 		do
-			dosym ../${CHOST/-/64-}/bin/${x} /usr/bin/${CHOST/-/64-}-${x}
+			[ ! -e "${D}/usr/bin/${CHOST}-${x}" ] && \
+				dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST}-${x}
+			dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST/-/64-}-${x}
 		done
 	fi
 
diff --git a/sys-devel/binutils/binutils-2.14.90.0.7-r1.ebuild b/sys-devel/binutils/binutils-2.14.90.0.7-r1.ebuild
index 6fcd0668eded..064571c084d3 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.7-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.7-r1.ebuild,v 1.2 2003/11/08 19:24:13 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.7-r1.ebuild,v 1.3 2003/11/09 15:43:16 azarah Exp $
 
 IUSE="nls bootstrap build"
 
@@ -163,9 +163,11 @@ src_install() {
 	then
 		dosym ${CHOST} /usr/${CHOST/-/64-}
 
-		for x in `ls ${D}/usr/${CHOST/-/64-}/bin/`
+		for x in `ls ${D}/usr/${CHOST}/bin/`
 		do
-			dosym ../${CHOST/-/64-}/bin/${x} /usr/bin/${CHOST/-/64-}-${x}
+			[ ! -e "${D}/usr/bin/${CHOST}-${x}" ] && \
+				dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST}-${x}
+			dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST/-/64-}-${x}
 		done
 	fi
 
diff --git a/sys-devel/binutils/binutils-2.14.90.0.7-r2.ebuild b/sys-devel/binutils/binutils-2.14.90.0.7-r2.ebuild
index 0da8443c7888..15632bf619d9 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.7-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.7-r2.ebuild,v 1.2 2003/11/09 01:44:45 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.7-r2.ebuild,v 1.3 2003/11/09 15:43:16 azarah Exp $
 
 IUSE="nls bootstrap build"
 
@@ -177,9 +177,11 @@ src_install() {
 	then
 		dosym ${CHOST} /usr/${CHOST/-/64-}
 
-		for x in `ls ${D}/usr/${CHOST/-/64-}/bin/`
+		for x in `ls ${D}/usr/${CHOST}/bin/`
 		do
-			dosym ../${CHOST/-/64-}/bin/${x} /usr/bin/${CHOST/-/64-}-${x}
+			[ ! -e "${D}/usr/bin/${CHOST}-${x}" ] && \
+				dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST}-${x}
+			dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST/-/64-}-${x}
 		done
 	fi
 
diff --git a/sys-devel/binutils/binutils-2.14.90.0.7-r3.ebuild b/sys-devel/binutils/binutils-2.14.90.0.7-r3.ebuild
new file mode 100644
index 000000000000..31d5ab375c18
--- /dev/null
+++ b/sys-devel/binutils/binutils-2.14.90.0.7-r3.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.7-r3.ebuild,v 1.1 2003/11/09 15:43:16 azarah Exp $
+
+IUSE="nls bootstrap build"
+
+# NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
+#                      the manpages, but seems this is incorrect ....
+
+inherit eutils libtool flag-o-matic
+
+# Generate borked binaries.  Bug #6730
+filter-flags "-fomit-frame-pointer -fssa"
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="Tools necessary to build programs"
+SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2
+	mirror://kernel/linux/devel/binutils/test/${P}.tar.bz2"
+HOMEPAGE="http://sources.redhat.com/binutils/"
+
+SLOT="0"
+LICENSE="GPL-2 | LGPL-2"
+KEYWORDS="~amd64 ~x86 ~ppc ~alpha ~sparc ~mips ~hppa ~arm ~ia64"
+
+DEPEND="virtual/glibc
+	nls? ( sys-devel/gettext )
+	!build? ( !bootstrap? ( dev-lang/perl ) )"
+
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/2.13/${PN}-2.13.90.0.10-glibc21.patch
+	epatch ${FILESDIR}/2.14/${PN}-2.14.90.0.4-sparc-nonpic.patch
+	epatch ${FILESDIR}/2.14/${PN}-2.14.90.0.6-eh-frame-ro-2.patch
+	epatch ${FILESDIR}/2.14/${PN}-2.14.90.0.4-ltconfig-multilib.patch
+# Might think of adding the Prescott stuff later on
+#	epatch ${FILESDIR}/2.14/${PN}-2.14.90.0.4-pni.patch
+	epatch ${FILESDIR}/2.14/${PN}-2.14.90.0.5-s390-pie.patch
+	epatch ${FILESDIR}/2.14/${PN}-2.14.90.0.5-ppc64-pie.patch
+	epatch ${FILESDIR}/2.13/${PN}-2.13.90.0.10-x86_64-testsuite.patch
+	epatch ${FILESDIR}/2.13/${PN}-2.13.90.0.10-x86_64-gotpcrel.patch
+	epatch ${FILESDIR}/2.13/${PN}-2.13.90.0.18-testsuite-Wall-fixes.patch
+
+# This one seems to be partly merged, will need to check later on why
+# some bits to bfd/elf-strtab.c was not merged ...
+	# This increase c++ linking 2 to 3 times, bug #27540.
+#	epatch ${FILESDIR}/2.14/${PN}-2.14.90.0.6-merge-speedup.patch
+
+	# Some IA64 patches
+	epatch ${FILESDIR}/2.14/${PN}-2.14.90.0.6-ia64-speedup.patch
+
+	# This fixes a problem with the wrong upcode being used for ppc's
+	# long branch stubs:
+	#
+	#   http://sources.redhat.com/ml/binutils/2003-11/msg00077.html
+	#   http://sources.redhat.com/ml/binutils/2003-11/msg00082.html
+	#
+	# and also fixes dynamic reloc for ppc and a number of other
+	# archs.
+	#
+	#  http://sources.redhat.com/ml/binutils/2003-11/msg00069.html
+	#
+	[ -z "`use sparc`" ] && \
+		epatch ${FILESDIR}/2.14/${PN}-2.14.90.0.7-ppc-reloc.patch
+
+	# Teach ld how to ensure that the TLS segment p_vaddr is aligned
+	# for a number of archs.
+	epatch ${FILESDIR}/2.14/${PN}-2.14.90.0.7-tls-section-alignment.patch
+
+	if [ "${ARCH}" = "amd64" ]
+	then
+		epatch ${FILESDIR}/${PN}-2.14.amd64-32bit-path-fix.patch
+	fi
+
+	use x86 &> /dev/null \
+		&& epatch ${FILESDIR}/2.13/${PN}-2.13.90.0.20-array-sects-compat.patch
+
+
+	# Libtool is broken (Redhat).
+	for x in ${S}/opcodes/Makefile.{am,in}
+	do
+		cp ${x} ${x}.orig
+		gawk '
+			{
+				if ($0 ~ /LIBADD/)
+					gsub("../bfd/libbfd.la", "-L../bfd/.libs ../bfd/libbfd.la")
+
+					print
+			}' ${x}.orig > ${x}
+		rm -rf ${x}.orig
+	done
+}
+
+src_compile() {
+	local myconf=
+
+	use nls && \
+		myconf="${myconf} --without-included-gettext" || \
+		myconf="${myconf} --disable-nls"
+
+	# Filter CFLAGS=".. -O2 .." on arm
+	if [ "${ARCH}" = "arm" ]
+	then
+		CFLAGS="$(echo "${CFLAGS}" | sed -e 's,-O[2-9] ,-O1 ,')"
+	fi
+
+	# Fix /usr/lib/libbfd.la
+	elibtoolize --portage
+
+	./configure --enable-shared \
+		--enable-64-bit-bfd \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--host=${CHOST} \
+		${myconf} || die
+
+	make configure-bfd || die
+	make headers -C bfd || die
+	emake tooldir="${ROOT}/usr/bin" \
+		all || die
+
+	if [ -z "`use build`" ]
+	then
+		if [ -z "`use bootstrap`" ]
+		then
+			# Nuke the manpages to recreate them (only use this if we have perl)
+			find . -name '*.1' -exec rm -f {} \; || :
+		fi
+		# Make the info pages (makeinfo included with gcc is used)
+		make info || die
+	fi
+}
+
+src_install() {
+
+	make prefix=${D}/usr \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		install || die
+
+	insinto /usr/include
+	doins include/libiberty.h
+
+	# c++filt is included with gcc -- what are these GNU people thinking?
+	# but not the manpage, so leave that!
+# We install it now, as gcc-3.3 do not have it any longer ...
+#	rm -f ${D}/usr/bin/c++filt #${D}/usr/share/man/man1/c++filt*
+
+	# By default strip has a symlink going from /usr/${CHOST}/bin/strip to
+	# /usr/bin/strip we should reverse it:
+
+	rm ${D}/usr/${CHOST}/bin/strip; mv ${D}/usr/bin/strip ${D}/usr/${CHOST}/bin/strip
+	# The strip symlink gets created in the loop below
+
+	# By default ar, as, ld, nm, ranlib and strip are in two places; create
+	# symlinks.  This will reduce the size of the tbz2 significantly.  We also
+	# move all the stuff in /usr/bin to /usr/${CHOST}/bin and create the
+	# appropriate symlinks.  Things are cleaner that way.
+	cd ${D}/usr/bin
+	local x=
+	for x in * strip
+	do
+	if [ ! -e ../${CHOST}/bin/${x} ]
+		then
+			mv ${x} ../${CHOST}/bin/${x}
+		else
+			rm -f ${x}
+		fi
+		ln -s ../${CHOST}/bin/${x} ${x}
+	done
+
+	if [ -n "${PROFILE_ARCH}" ] && \
+	   [ "${PROFILE_ARCH/64}" != "${PROFILE_ARCH}" ]
+	then
+		dosym ${CHOST} /usr/${CHOST/-/64-}
+
+		for x in `ls ${D}/usr/${CHOST}/bin/`
+		do
+			[ ! -e "${D}/usr/bin/${CHOST}-${x}" ] && \
+				dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST}-${x}
+			dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST/-/64-}-${x}
+		done
+	fi
+
+	cd ${S}
+	if [ -z "`use build`" ]
+	then
+		make prefix=${D}/usr \
+			mandir=${D}/usr/share/man \
+			infodir=${D}/usr/share/info \
+			install-info || die
+
+		dodoc COPYING* README
+		docinto bfd
+		dodoc bfd/ChangeLog* bfd/COPYING bfd/README bfd/PORTING bfd/TODO
+		docinto binutils
+		dodoc binutils/ChangeLog binutils/NEWS binutils/README
+		docinto gas
+		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/COPYING gas/NEWS gas/README*
+		docinto gprof
+		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO
+		docinto ld
+		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
+		docinto libiberty
+		dodoc libiberty/ChangeLog* libiberty/COPYING.LIB libiberty/README
+		docinto opcodes
+		dodoc opcodes/ChangeLog*
+		# Install pre-generated manpages .. currently we do not ...
+	else
+		rm -rf ${D}/usr/share/man
+	fi
+}
diff --git a/sys-devel/binutils/binutils-2.14.90.0.7.ebuild b/sys-devel/binutils/binutils-2.14.90.0.7.ebuild
index 89be4b1c2b27..74c45ee5483e 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.7.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.7.ebuild,v 1.4 2003/11/08 19:24:13 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.7.ebuild,v 1.5 2003/11/09 15:43:16 azarah Exp $
 
 IUSE="nls bootstrap build"
 
@@ -159,9 +159,11 @@ src_install() {
 	then
 		dosym ${CHOST} /usr/${CHOST/-/64-}
 
-		for x in `ls ${D}/usr/${CHOST/-/64-}/bin/`
+		for x in `ls ${D}/usr/${CHOST}/bin/`
 		do
-			dosym ../${CHOST/-/64-}/bin/${x} /usr/bin/${CHOST/-/64-}-${x}
+			[ ! -e "${D}/usr/bin/${CHOST}-${x}" ] && \
+				dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST}-${x}
+			dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST/-/64-}-${x}
 		done
 	fi
 
diff --git a/sys-devel/binutils/files/digest-binutils-2.14.90.0.7-r3 b/sys-devel/binutils/files/digest-binutils-2.14.90.0.7-r3
new file mode 100644
index 000000000000..07f652ab2119
--- /dev/null
+++ b/sys-devel/binutils/files/digest-binutils-2.14.90.0.7-r3
@@ -0,0 +1 @@
+MD5 b5b1608f7308c487c0f3af8e4592a71a binutils-2.14.90.0.7.tar.bz2 10575077