diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/Manifest
new file mode 100644
index 0000000000..27b0a1571d
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/Manifest
@@ -0,0 +1,2 @@
+DIST binutils-2.21.1-patches-1.0.tar.bz2 9168 RMD160 b475a318e371d550d01678da18ac8f4d58c149ec SHA1 1a835aa2ed8c268075a96b6694256410bfaf859d SHA256 f0c3ad8f984242dbc8a4f45b9594fb12dc9a45d348930038ac24c5726aafa716
+DIST binutils-2.21.1.tar.bz2 18997755 RMD160 de5ce1d7cb0d44e3ec18c557beefb2a292d59a60 SHA1 525255ca6874b872540c9967a1d26acfbc7c8230 SHA256 cdecfa69f02aa7b05fbcdf678e33137151f361313b2f3e48aba925f64eabf654
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/binutils-2.22-r16.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/binutils-2.22-r16.ebuild
new file mode 100644
index 0000000000..00f4e97d21
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/binutils-2.22-r16.ebuild
@@ -0,0 +1,308 @@
+# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+CROS_WORKON_COMMIT="9c1580ea72a5a3b15d90a9baf82c2f7707b793c4"
+CROS_WORKON_TREE="2a7750a0cddd72df341d61250ade80d6270afbd7"
+CROS_WORKON_PROJECT=chromiumos/third_party/binutils
+
+inherit eutils libtool flag-o-matic gnuconfig multilib versionator cros-workon
+
+KEYWORDS="amd64 arm x86"
+
+BVER=${PV}
+
+# Version names
+if [[ "${PV}" == "9999" ]] ; then
+	BINUTILS_VERSION="binutils-2.22"
+else
+	BINUTILS_VERSION="${P}"
+fi
+
+BINUTILS_PKG_VERSION="${BINUTILS_VERSION}_cos_gg"
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="http://sources.redhat.com/binutils/"
+LICENSE="|| ( GPL-3 LGPL-3 )"
+IUSE="hardened mounted_binutils multislot multitarget nls test vanilla"
+if use multislot ; then
+	SLOT="${CTARGET}-${BVER}"
+elif is_cross ; then
+	SLOT="${CTARGET}"
+else
+	SLOT="0"
+fi
+
+RDEPEND=">=sys-devel/binutils-config-1.9"
+DEPEND="${RDEPEND}
+	test? ( dev-util/dejagnu )
+	nls? ( sys-devel/gettext )
+	sys-devel/flex"
+
+S_BINUTILS="${WORKDIR}/${BINUTILS_VERSION}"
+
+RESTRICT="fetch strip"
+
+MY_BUILDDIR_BINUTILS="${WORKDIR}/build"
+
+GITDIR=${WORKDIR}/gitdir
+
+LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${BVER}
+INCPATH=${LIBPATH}/include
+DATAPATH=/usr/share/binutils-data/${CTARGET}/${BVER}
+if is_cross ; then
+	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${BVER}
+else
+	BINPATH=/usr/${CTARGET}/binutils-bin/${BVER}
+fi
+
+src_unpack() {
+	if use mounted_binutils ; then
+		BINUTILS_DIR="/usr/local/toolchain_root/binutils"
+		if [[ ! -d ${BINUTILS_DIR} ]] ; then
+			die "binutils dirs not mounted at: ${BINUTILS_DIR}"
+		fi
+	else
+		cros-workon_src_unpack
+		mv "${S}" "${GITDIR}"
+		BINUTILS_DIR="${GITDIR}"
+		if [ -d "${GITDIR}/.git" ]; then
+			CL=$(cd "${BINUTILS_DIR}"; git log --pretty=format:%s -n1 | egrep -o '[0-9]+')
+		fi
+	fi
+	if [[ ! -z ${CL} ]] ; then
+		BINUTILS_PKG_VERSION="${BINUTILS_PKG_VERSION}_${CL}"
+	fi
+	ln -s ${BINUTILS_DIR} ${S_BINUTILS}
+
+	mkdir -p "${MY_BUILDDIR_BINUTILS}"
+}
+
+
+src_compile() {
+	# keep things sane
+	strip-flags
+
+	local x
+	echo
+	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
+		einfo "$(printf '%10s' ${x}:) ${!x}"
+	done
+	echo
+
+	cd "${MY_BUILDDIR_BINUTILS}"
+	local myconf=""
+	is_cross && myconf="${myconf} --with-sysroot=/usr/${CTARGET}"
+	myconf="--prefix=/usr \
+		--host=${CHOST} \
+		--target=${CTARGET} \
+		--datadir=${DATAPATH} \
+		--infodir=${DATAPATH}/info \
+		--mandir=${DATAPATH}/man \
+		--bindir=${BINPATH} \
+		--libdir=${LIBPATH} \
+		--libexecdir=${LIBPATH} \
+		--includedir=${INCPATH} \
+		--enable-64-bit-bfd \
+		--enable-gold \
+		--enable-shared \
+		--disable-werror \
+		--enable-secureplt \
+		--enable-plugins \
+		--without-included-gettext \
+		--build=${CBUILD} \
+		--with-bugurl=http://code.google.com/p/chromium-os/issues/entry \
+		${myconf} ${EXTRA_ECONF}"
+
+	binutils_conf="${myconf} --with-pkgversion=${BINUTILS_PKG_VERSION}"
+
+	echo ./configure ${binutils_conf}
+	"${S_BINUTILS}"/configure ${binutils_conf} || die "configure failed"
+
+	emake all || die "emake failed"
+
+	# only build info pages if we user wants them, and if
+	# we have makeinfo (may not exist when we bootstrap)
+	if type -p makeinfo > /dev/null ; then
+		emake info || die "make info failed"
+	fi
+	# we nuke the manpages when we're left with junk
+	# (like when we bootstrap, no perl -> no manpages)
+	find . -name '*.1' -a -size 0 | xargs rm -f
+}
+
+src_test() {
+	cd "${MY_BUILDDIR_BINUTILS}"
+	make check || die "check failed :("
+}
+
+src_install() {
+	local x d
+
+	cd "${MY_BUILDDIR_BINUTILS}"
+	emake DESTDIR="${D}" tooldir="${LIBPATH}" install || die
+	rm -rf "${D}"/${LIBPATH}/bin
+
+	# Newer versions of binutils get fancy with ${LIBPATH} #171905
+	cd "${D}"/${LIBPATH}
+	for d in ../* ; do
+		[[ ${d} == ../${BVER} ]] && continue
+		mv ${d}/* . || die
+		rmdir ${d} || die
+	done
+
+	# Now we collect everything intp the proper SLOT-ed dirs
+	# When something is built to cross-compile, it installs into
+	# /usr/$CHOST/ by default ... we have to 'fix' that :)
+	if is_cross ; then
+		cd "${D}"/${BINPATH}
+		for x in * ; do
+			mv ${x} ${x/${CTARGET}-}
+		done
+
+		if [[ -d ${D}/usr/${CHOST}/${CTARGET} ]] ; then
+			mv "${D}"/usr/${CHOST}/${CTARGET}/include "${D}"/${INCPATH}
+			mv "${D}"/usr/${CHOST}/${CTARGET}/lib/* "${D}"/${LIBPATH}/
+			rm -r "${D}"/usr/${CHOST}/{include,lib}
+		fi
+	fi
+	insinto ${INCPATH}
+	doins "${S_BINUTILS}/include/libiberty.h"
+	if [[ -d ${D}/${LIBPATH}/lib ]] ; then
+		mv "${D}"/${LIBPATH}/lib/* "${D}"/${LIBPATH}/
+		rm -r "${D}"/${LIBPATH}/lib
+	fi
+
+	# Now, some binutils are tricky and actually provide
+	# for multiple TARGETS.  Really, we're talking just
+	# 32bit/64bit support (like mips/ppc/sparc).  Here
+	# we want to tell binutils-config that it's cool if
+	# it generates multiple sets of binutil symlinks.
+	# e.g. sparc gets {sparc,sparc64}-unknown-linux-gnu
+	local targ=${CTARGET/-*} src="" dst=""
+	local FAKE_TARGETS=${CTARGET}
+	case ${targ} in
+		mips*)    src="mips"    dst="mips64";;
+		powerpc*) src="powerpc" dst="powerpc64";;
+		s390*)    src="s390"    dst="s390x";;
+		sparc*)   src="sparc"   dst="sparc64";;
+	esac
+	case ${targ} in
+		mips64*|powerpc64*|s390x*|sparc64*) targ=${src} src=${dst} dst=${targ};;
+	esac
+	[[ -n ${src}${dst} ]] && FAKE_TARGETS="${FAKE_TARGETS} ${CTARGET/${src}/${dst}}"
+
+	# Generate an env.d entry for this binutils
+	insinto /etc/env.d/binutils
+	cat <<-EOF > "${T}"/env.d
+	TARGET="${CTARGET}"
+	VER="${BVER}"
+	LIBPATH="${LIBPATH}"
+	FAKE_TARGETS="${FAKE_TARGETS}"
+	EOF
+	newins "${T}"/env.d ${CTARGET}-${BVER}
+
+	# Handle documentation
+	if ! is_cross ; then
+		cd "${S_BINUTILS}"
+		dodoc README
+		docinto bfd
+		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
+		docinto binutils
+		dodoc binutils/ChangeLog binutils/NEWS binutils/README
+		docinto gas
+		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
+		docinto gprof
+		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
+		docinto ld
+		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
+		docinto libiberty
+		dodoc libiberty/ChangeLog* libiberty/README
+		docinto opcodes
+		dodoc opcodes/ChangeLog*
+	fi
+	# Remove shared info pages
+	rm -f "${D}"/${DATAPATH}/info/{dir,configure.info,standards.info}
+	# Trim all empty dirs
+	find "${D}" -type d | xargs rmdir >& /dev/null
+
+	if use hardened ; then
+		LDWRAPPER=ldwrapper.hardened
+	else
+		LDWRAPPER=ldwrapper
+	fi
+
+	mv "${D}/${BINPATH}/ld.bfd" "${D}/${BINPATH}/ld.bfd.real" || die
+	exeinto "${BINPATH}"
+	newexe "${FILESDIR}/${LDWRAPPER}" "ld.bfd" || die
+
+	mv "${D}/${BINPATH}/ld.gold" "${D}/${BINPATH}/ld.gold.real" || die
+	exeinto "${BINPATH}"
+	newexe "${FILESDIR}/${LDWRAPPER}" "ld.gold" || die
+
+	# Set default to be ld.bfd in regular installation
+	dosym ld.bfd "${BINPATH}/ld"
+
+	# Make a fake installation for gold with gold as the default linker
+	# so we can turn gold on/off with binutils-config
+	LASTDIR=${LIBPATH##/*/}
+	dosym "${LASTDIR}" "${LIBPATH}-gold"
+	LASTDIR=${DATAPATH##/*/}
+	dosym "${LASTDIR}" "${DATAPATH}-gold"
+
+	mkdir "${D}/${BINPATH}-gold"
+	cd "${D}"/${BINPATH}
+	LASTDIR=${BINPATH##/*/}
+	for x in * ; do
+		dosym "../${LASTDIR}/${x}" "${BINPATH}-gold/${x}"
+	done
+	dosym ld.gold "${BINPATH}-gold/ld"
+
+	# Install gold binutils-config configuration file
+	insinto /etc/env.d/binutils
+	cat <<-EOF > "${T}"/env.d
+	TARGET="${CTARGET}"
+	VER="${BVER}-gold"
+	LIBPATH="${LIBPATH}-gold"
+	FAKE_TARGETS="${FAKE_TARGETS}"
+	EOF
+	newins "${T}"/env.d ${CTARGET}-${BVER}-gold
+
+	# Move the locale directory to where it is supposed to be
+	mv "${D}/usr/share/locale" "${D}/${DATAPATH}/"
+}
+
+pkg_postinst() {
+	binutils-config ${CTARGET}-${BVER}
+}
+
+pkg_postrm() {
+	local current_profile=$(binutils-config -c ${CTARGET})
+
+	# If no other versions exist, then uninstall for this
+	# target ... otherwise, switch to the newest version
+	# Note: only do this if this version is unmerged.  We
+	#       rerun binutils-config if this is a remerge, as
+	#       we want the mtimes on the symlinks updated (if
+	#       it is the same as the current selected profile)
+	if [[ ! -e ${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${BVER} ]] ; then
+		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
+		choice=${choice//$'\n'/ }
+		choice=${choice/* }
+		if [[ -z ${choice} ]] ; then
+			env -i binutils-config -u ${CTARGET}
+		else
+			binutils-config ${choice}
+		fi
+	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${BVER} ]] ; then
+		binutils-config ${CTARGET}-${BVER}
+	fi
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/binutils-2.23.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/binutils-2.23.1.ebuild
new file mode 100644
index 0000000000..1df00d62f0
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/binutils-2.23.1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.23.1.ebuild,v 1.1 2012/11/15 19:43:36 vapier Exp $
+
+PATCHVER="1.0"
+ELF2FLT_VER=""
+inherit toolchain-binutils
+
+KEYWORDS=""
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/binutils-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/binutils-9999.ebuild
new file mode 100644
index 0000000000..f95e456941
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/binutils-9999.ebuild
@@ -0,0 +1,306 @@
+# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+CROS_WORKON_PROJECT=chromiumos/third_party/binutils
+
+inherit eutils libtool flag-o-matic gnuconfig multilib versionator cros-workon
+
+KEYWORDS="~amd64 ~arm ~x86"
+
+BVER=${PV}
+
+# Version names
+if [[ "${PV}" == "9999" ]] ; then
+	BINUTILS_VERSION="binutils-2.22"
+else
+	BINUTILS_VERSION="${P}"
+fi
+
+BINUTILS_PKG_VERSION="${BINUTILS_VERSION}_cos_gg"
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="http://sources.redhat.com/binutils/"
+LICENSE="|| ( GPL-3 LGPL-3 )"
+IUSE="hardened mounted_binutils multislot multitarget nls test vanilla"
+if use multislot ; then
+	SLOT="${CTARGET}-${BVER}"
+elif is_cross ; then
+	SLOT="${CTARGET}"
+else
+	SLOT="0"
+fi
+
+RDEPEND=">=sys-devel/binutils-config-1.9"
+DEPEND="${RDEPEND}
+	test? ( dev-util/dejagnu )
+	nls? ( sys-devel/gettext )
+	sys-devel/flex"
+
+S_BINUTILS="${WORKDIR}/${BINUTILS_VERSION}"
+
+RESTRICT="fetch strip"
+
+MY_BUILDDIR_BINUTILS="${WORKDIR}/build"
+
+GITDIR=${WORKDIR}/gitdir
+
+LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${BVER}
+INCPATH=${LIBPATH}/include
+DATAPATH=/usr/share/binutils-data/${CTARGET}/${BVER}
+if is_cross ; then
+	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${BVER}
+else
+	BINPATH=/usr/${CTARGET}/binutils-bin/${BVER}
+fi
+
+src_unpack() {
+	if use mounted_binutils ; then
+		BINUTILS_DIR="/usr/local/toolchain_root/binutils"
+		if [[ ! -d ${BINUTILS_DIR} ]] ; then
+			die "binutils dirs not mounted at: ${BINUTILS_DIR}"
+		fi
+	else
+		cros-workon_src_unpack
+		mv "${S}" "${GITDIR}"
+		BINUTILS_DIR="${GITDIR}"
+		if [ -d "${GITDIR}/.git" ]; then
+			CL=$(cd "${BINUTILS_DIR}"; git log --pretty=format:%s -n1 | egrep -o '[0-9]+')
+		fi
+	fi
+	if [[ ! -z ${CL} ]] ; then
+		BINUTILS_PKG_VERSION="${BINUTILS_PKG_VERSION}_${CL}"
+	fi
+	ln -s ${BINUTILS_DIR} ${S_BINUTILS}
+
+	mkdir -p "${MY_BUILDDIR_BINUTILS}"
+}
+
+
+src_compile() {
+	# keep things sane
+	strip-flags
+
+	local x
+	echo
+	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
+		einfo "$(printf '%10s' ${x}:) ${!x}"
+	done
+	echo
+
+	cd "${MY_BUILDDIR_BINUTILS}"
+	local myconf=""
+	is_cross && myconf="${myconf} --with-sysroot=/usr/${CTARGET}"
+	myconf="--prefix=/usr \
+		--host=${CHOST} \
+		--target=${CTARGET} \
+		--datadir=${DATAPATH} \
+		--infodir=${DATAPATH}/info \
+		--mandir=${DATAPATH}/man \
+		--bindir=${BINPATH} \
+		--libdir=${LIBPATH} \
+		--libexecdir=${LIBPATH} \
+		--includedir=${INCPATH} \
+		--enable-64-bit-bfd \
+		--enable-gold \
+		--enable-shared \
+		--disable-werror \
+		--enable-secureplt \
+		--enable-plugins \
+		--without-included-gettext \
+		--build=${CBUILD} \
+		--with-bugurl=http://code.google.com/p/chromium-os/issues/entry \
+		${myconf} ${EXTRA_ECONF}"
+
+	binutils_conf="${myconf} --with-pkgversion=${BINUTILS_PKG_VERSION}"
+
+	echo ./configure ${binutils_conf}
+	"${S_BINUTILS}"/configure ${binutils_conf} || die "configure failed"
+
+	emake all || die "emake failed"
+
+	# only build info pages if we user wants them, and if
+	# we have makeinfo (may not exist when we bootstrap)
+	if type -p makeinfo > /dev/null ; then
+		emake info || die "make info failed"
+	fi
+	# we nuke the manpages when we're left with junk
+	# (like when we bootstrap, no perl -> no manpages)
+	find . -name '*.1' -a -size 0 | xargs rm -f
+}
+
+src_test() {
+	cd "${MY_BUILDDIR_BINUTILS}"
+	make check || die "check failed :("
+}
+
+src_install() {
+	local x d
+
+	cd "${MY_BUILDDIR_BINUTILS}"
+	emake DESTDIR="${D}" tooldir="${LIBPATH}" install || die
+	rm -rf "${D}"/${LIBPATH}/bin
+
+	# Newer versions of binutils get fancy with ${LIBPATH} #171905
+	cd "${D}"/${LIBPATH}
+	for d in ../* ; do
+		[[ ${d} == ../${BVER} ]] && continue
+		mv ${d}/* . || die
+		rmdir ${d} || die
+	done
+
+	# Now we collect everything intp the proper SLOT-ed dirs
+	# When something is built to cross-compile, it installs into
+	# /usr/$CHOST/ by default ... we have to 'fix' that :)
+	if is_cross ; then
+		cd "${D}"/${BINPATH}
+		for x in * ; do
+			mv ${x} ${x/${CTARGET}-}
+		done
+
+		if [[ -d ${D}/usr/${CHOST}/${CTARGET} ]] ; then
+			mv "${D}"/usr/${CHOST}/${CTARGET}/include "${D}"/${INCPATH}
+			mv "${D}"/usr/${CHOST}/${CTARGET}/lib/* "${D}"/${LIBPATH}/
+			rm -r "${D}"/usr/${CHOST}/{include,lib}
+		fi
+	fi
+	insinto ${INCPATH}
+	doins "${S_BINUTILS}/include/libiberty.h"
+	if [[ -d ${D}/${LIBPATH}/lib ]] ; then
+		mv "${D}"/${LIBPATH}/lib/* "${D}"/${LIBPATH}/
+		rm -r "${D}"/${LIBPATH}/lib
+	fi
+
+	# Now, some binutils are tricky and actually provide
+	# for multiple TARGETS.  Really, we're talking just
+	# 32bit/64bit support (like mips/ppc/sparc).  Here
+	# we want to tell binutils-config that it's cool if
+	# it generates multiple sets of binutil symlinks.
+	# e.g. sparc gets {sparc,sparc64}-unknown-linux-gnu
+	local targ=${CTARGET/-*} src="" dst=""
+	local FAKE_TARGETS=${CTARGET}
+	case ${targ} in
+		mips*)    src="mips"    dst="mips64";;
+		powerpc*) src="powerpc" dst="powerpc64";;
+		s390*)    src="s390"    dst="s390x";;
+		sparc*)   src="sparc"   dst="sparc64";;
+	esac
+	case ${targ} in
+		mips64*|powerpc64*|s390x*|sparc64*) targ=${src} src=${dst} dst=${targ};;
+	esac
+	[[ -n ${src}${dst} ]] && FAKE_TARGETS="${FAKE_TARGETS} ${CTARGET/${src}/${dst}}"
+
+	# Generate an env.d entry for this binutils
+	insinto /etc/env.d/binutils
+	cat <<-EOF > "${T}"/env.d
+	TARGET="${CTARGET}"
+	VER="${BVER}"
+	LIBPATH="${LIBPATH}"
+	FAKE_TARGETS="${FAKE_TARGETS}"
+	EOF
+	newins "${T}"/env.d ${CTARGET}-${BVER}
+
+	# Handle documentation
+	if ! is_cross ; then
+		cd "${S_BINUTILS}"
+		dodoc README
+		docinto bfd
+		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
+		docinto binutils
+		dodoc binutils/ChangeLog binutils/NEWS binutils/README
+		docinto gas
+		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
+		docinto gprof
+		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
+		docinto ld
+		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
+		docinto libiberty
+		dodoc libiberty/ChangeLog* libiberty/README
+		docinto opcodes
+		dodoc opcodes/ChangeLog*
+	fi
+	# Remove shared info pages
+	rm -f "${D}"/${DATAPATH}/info/{dir,configure.info,standards.info}
+	# Trim all empty dirs
+	find "${D}" -type d | xargs rmdir >& /dev/null
+
+	if use hardened ; then
+		LDWRAPPER=ldwrapper.hardened
+	else
+		LDWRAPPER=ldwrapper
+	fi
+
+	mv "${D}/${BINPATH}/ld.bfd" "${D}/${BINPATH}/ld.bfd.real" || die
+	exeinto "${BINPATH}"
+	newexe "${FILESDIR}/${LDWRAPPER}" "ld.bfd" || die
+
+	mv "${D}/${BINPATH}/ld.gold" "${D}/${BINPATH}/ld.gold.real" || die
+	exeinto "${BINPATH}"
+	newexe "${FILESDIR}/${LDWRAPPER}" "ld.gold" || die
+
+	# Set default to be ld.bfd in regular installation
+	dosym ld.bfd "${BINPATH}/ld"
+
+	# Make a fake installation for gold with gold as the default linker
+	# so we can turn gold on/off with binutils-config
+	LASTDIR=${LIBPATH##/*/}
+	dosym "${LASTDIR}" "${LIBPATH}-gold"
+	LASTDIR=${DATAPATH##/*/}
+	dosym "${LASTDIR}" "${DATAPATH}-gold"
+
+	mkdir "${D}/${BINPATH}-gold"
+	cd "${D}"/${BINPATH}
+	LASTDIR=${BINPATH##/*/}
+	for x in * ; do
+		dosym "../${LASTDIR}/${x}" "${BINPATH}-gold/${x}"
+	done
+	dosym ld.gold "${BINPATH}-gold/ld"
+
+	# Install gold binutils-config configuration file
+	insinto /etc/env.d/binutils
+	cat <<-EOF > "${T}"/env.d
+	TARGET="${CTARGET}"
+	VER="${BVER}-gold"
+	LIBPATH="${LIBPATH}-gold"
+	FAKE_TARGETS="${FAKE_TARGETS}"
+	EOF
+	newins "${T}"/env.d ${CTARGET}-${BVER}-gold
+
+	# Move the locale directory to where it is supposed to be
+	mv "${D}/usr/share/locale" "${D}/${DATAPATH}/"
+}
+
+pkg_postinst() {
+	binutils-config ${CTARGET}-${BVER}
+}
+
+pkg_postrm() {
+	local current_profile=$(binutils-config -c ${CTARGET})
+
+	# If no other versions exist, then uninstall for this
+	# target ... otherwise, switch to the newest version
+	# Note: only do this if this version is unmerged.  We
+	#       rerun binutils-config if this is a remerge, as
+	#       we want the mtimes on the symlinks updated (if
+	#       it is the same as the current selected profile)
+	if [[ ! -e ${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${BVER} ]] ; then
+		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
+		choice=${choice//$'\n'/ }
+		choice=${choice/* }
+		if [[ -z ${choice} ]] ; then
+			env -i binutils-config -u ${CTARGET}
+		else
+			binutils-config ${choice}
+		fi
+	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${BVER} ]] ; then
+		binutils-config ${CTARGET}-${BVER}
+	fi
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/aswrapper b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/aswrapper
new file mode 100755
index 0000000000..ee6641cbb6
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/aswrapper
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This files wraps as.
+# In addition, it adds --allow-incbin to the command line before invoking as.
+# This flag is necessary on link commands that use the .incbin directive.
+
+exec "$(readlink -f "${0}").real" --allow-incbin "$@"
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/chromeos-version.sh b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/chromeos-version.sh
new file mode 100755
index 0000000000..ff99b230d6
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/chromeos-version.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+#
+# This script is given one argument: the base of the source directory of
+# the package, and it prints a string on stdout with the numerical version
+# number for said repo.
+
+exec sed -n '/^ *VERSION=/{s:.*=::;p;q}' \
+	"$(find "$1" -path '*/bfd/configure')"
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/ldwrapper b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/ldwrapper
new file mode 100755
index 0000000000..48d754694a
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/ldwrapper
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This files wraps ld and ld.gold.
+# In addition, it adds --hash-style=gnu to the linker command line.
+
+exec "$(readlink -f "${0}").real" --hash-style=gnu "$@"
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/ldwrapper.hardened b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/ldwrapper.hardened
new file mode 100755
index 0000000000..c38fb10078
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/binutils/files/ldwrapper.hardened
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This files wraps ld and ld.gold.
+# In addition, it inserts hardened flags (-z now and -z relro) to the linker
+# before invoking it. It also adds --hash-style=gnu to the linker command line.
+#
+# There is a similar wrapper around gcc that adds -fPIE, -fstack-protector-all,
+# -D_FORTIFY_SOURCE=2 and -pie to the compile command line.
+
+exec "$(readlink -f "${0}").real" -z now -z relro --hash-style=gnu "$@"