Add amd64 string and math patches, bug #100289. Extra patches from

Simon Strandman's patchset for glibc-2.3.90 that I ported to 2.3.6.

(Portage version: 2.1_pre4-r1)

4 files changed, 1433 insertions, 14 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 94d25be42162..9061fb939477 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.428 2006/02/09 21:59:29 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.429 2006/02/18 11:23:54 azarah Exp $
+
+*glibc-2.3.6-r3 (12 Feb 2006)
+
+  12 Feb 2006; Martin Schlemmer <azarah@gentoo.org> +glibc-2.3.6-r3.ebuild:
+  Add amd64 string and math patches, bug #100289. Extra patches from
+  Simon Strandman's patchset for glibc-2.3.90 that I ported to 2.3.6.
 
   29 Jan 2006; Mike Frysinger <vapier@gentoo.org>
   -files/glibc-manpages-2.2.5.tar.bz2, -files/glibc-manpages-2.3.2.tar.bz2,
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index e751abbc5fb8..0f121f61935c 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 601f611f64d1336134b4140e42b907e0 ChangeLog 89363
-RMD160 04021ec0cb79a92d25fc547f2e1a0126f02cac43 ChangeLog 89363
-SHA256 52c66604e8145507260599b63ea04f33dcf708dea119966d73671940e36e61c9 ChangeLog 89363
+MD5 3e4abf647990aca3b83b5695303555ad ChangeLog 89655
+RMD160 24315050390a52b41c2b17c444ddc8b01e758ce5 ChangeLog 89655
+SHA256 7de5bd82fc55afa2bca98f675c0d9670d266ffc6151ef9f6e079ea4c58de0f05 ChangeLog 89655
 MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 RMD160 f1162b7f313f7ea18fb178157d3bd6205d818e3a files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 SHA256 0bc07eb47578d5bfb98774b18bf07aee2af44a7ccd947602c223b34e0d88394a files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
@@ -331,6 +328,9 @@ SHA256 aeee41acc25d40e034a930de38e4cfa68a041992b2f39ce5876eeefdf3b8ad84 files/di
 MD5 dceca9a720556f97d4c0576f08b379d1 files/digest-glibc-2.3.6-r2 517
 RMD160 e7d6efa98e39a65a0d92196d63308a990c0797db files/digest-glibc-2.3.6-r2 517
 SHA256 73a3aef3f10593394a3dc1c9ceafdf7854de9a8a565a7ffea6fb37deea903c92 files/digest-glibc-2.3.6-r2 517
+MD5 5ee592eb9101d307f0138462d9dc3b88 files/digest-glibc-2.3.6-r3 1876
+RMD160 3938d5785367404be0e2d2999e3dacb2cc111bfa files/digest-glibc-2.3.6-r3 1876
+SHA256 376c746340fb658db777dee37dfe21f4c2044e8c75384474c4cc87d580903be0 files/digest-glibc-2.3.6-r3 1876
 MD5 e4393f4721a207750581d6265d5f7f40 files/fix-sysctl_h.patch 376
 RMD160 b5dd68158224b09ddc42986be02351c74f81e0a0 files/fix-sysctl_h.patch 376
 SHA256 3a589f63fd1f3f6c5a00c66a10943d3d64630aefb1eb5b37e7f2a856fcea234a files/fix-sysctl_h.patch 376
@@ -403,16 +403,12 @@ SHA256 f52bccd7230c3b84a540f522191e800240e7a8b68c797d8a77be65f0f9b5a004 glibc-2.
 MD5 f07be1575b5d04702f099dbbce7f78de glibc-2.3.6-r2.ebuild 42796
 RMD160 525938f491a8a6c80f7a6e7830f25d92a9b51183 glibc-2.3.6-r2.ebuild 42796
 SHA256 89712d41f65514640a68b4d35458edb3a3940de29a9cba9ee88f674762ed6520 glibc-2.3.6-r2.ebuild 42796
+MD5 543c82f41e9fa11e711a593d17b278d6 glibc-2.3.6-r3.ebuild 42957
+RMD160 1efa14ceb80bc0a1222de334ab4da159a500f4d2 glibc-2.3.6-r3.ebuild 42957
+SHA256 a902da7da98931debe54a8a2afa6b22f60e12c0c57af2e06acdcc25ae4c3d898 glibc-2.3.6-r3.ebuild 42957
 MD5 de12b8950c10db441f5c5229a7809e76 glibc-2.3.6.ebuild 40698
 RMD160 335e0e0dd2e2891a761eaf2014aaeb4f2615f276 glibc-2.3.6.ebuild 40698
 SHA256 4ff27f682df4b31ef7b2aebe576e1b781ec1df566a0e0bfc899a603dd5cba723 glibc-2.3.6.ebuild 40698
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a metadata.xml 162
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD67tRV3J2n04EauwRAqEbAJoCipNNShJ1MrwYDb40BeAjnEc9hwCeMlP6
-9DStxpVAckj+KN49AxGxwyI=
-=/VSm
------END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.6-r3 b/sys-libs/glibc/files/digest-glibc-2.3.6-r3
new file mode 100644
index 000000000000..11db881977b5
--- /dev/null
+++ b/sys-libs/glibc/files/digest-glibc-2.3.6-r3
@@ -0,0 +1,21 @@
+MD5 fd212c6a9858968f5c9169ce133c64e3 glibc-2.3.6-patches-1.7.tar.bz2 136534
+RMD160 438cb4412de4b70c462f4a59ca0cf5ecf6d1e3c5 glibc-2.3.6-patches-1.7.tar.bz2 136534
+SHA256 8cd135607e3bdb41d2c6b5c48a9ca37816cbebcb23c2160bc3be7454875bb93b glibc-2.3.6-patches-1.7.tar.bz2 136534
+MD5 bfdce99f82d6dbcb64b7f11c05d6bc96 glibc-2.3.6.tar.bz2 14014977
+RMD160 04b4f71cc3e89581e02ee2dbf5ab05f61e868bf1 glibc-2.3.6.tar.bz2 14014977
+SHA256 e73ff5eddea95d09238b41d3c9c4d9ccddcf99fcc93d04956599c91c704f4a8e glibc-2.3.6.tar.bz2 14014977
+MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998
+RMD160 cfc859a7e0a904cfb340c832267d3377e850cf6e glibc-fedora-20041219T2331.tar.bz2 761998
+SHA256 e36ffa84388ebb746cb80c37d6fd1acc9e45e07b85c30b0a2ad9f511fae59cec glibc-fedora-20041219T2331.tar.bz2 761998
+MD5 1c7fa36de8bdb130e4b697d25cc672cd glibc-infopages-2.3.6.tar.bz2 1298413
+RMD160 5a83ca63c4153e5677797c0c0043aec0b55a6fe3 glibc-infopages-2.3.6.tar.bz2 1298413
+SHA256 651701bb5d8431401fa0f2252ad1cd37f69dc3a2aa28e4ce3405b4417b5e2c22 glibc-infopages-2.3.6.tar.bz2 1298413
+MD5 49dbe06ce830fc73874d6b38bdc5b4db glibc-libidn-2.3.6.tar.bz2 101041
+RMD160 7bc8e8fa310d2ae543802ea036c036c60d09270d glibc-libidn-2.3.6.tar.bz2 101041
+SHA256 99a20232c1ad994e8a6dcd15c34e413eed94e7dd558bed7b832649dce09fb4f2 glibc-libidn-2.3.6.tar.bz2 101041
+MD5 d4eeda37472666a15cc1f407e9c987a9 glibc-linuxthreads-2.3.6.tar.bz2 243534
+RMD160 bb89ac687419cede738314923bc952d191d8d252 glibc-linuxthreads-2.3.6.tar.bz2 243534
+SHA256 6c3bc4a247d1e5308fb14f81956802f09095d3683219859fcad5795aa3aea638 glibc-linuxthreads-2.3.6.tar.bz2 243534
+MD5 0b5f8f3e19c4c4efd1ab15a3823c4538 glibc-manpages-2.3.6-1.tar.bz2 22216
+RMD160 a69fc155366d1b263acecd026718dc536c2b12b8 glibc-manpages-2.3.6-1.tar.bz2 22216
+SHA256 2ba9c7fff2f02f888160dbadd013356fe4a6e9f3d71ac583f5ba6a1d73cb2ab6 glibc-manpages-2.3.6-1.tar.bz2 22216
diff --git a/sys-libs/glibc/glibc-2.3.6-r3.ebuild b/sys-libs/glibc/glibc-2.3.6-r3.ebuild
new file mode 100644
index 000000000000..c4e9e8079dc4
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.3.6-r3.ebuild
@@ -0,0 +1,1396 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r3.ebuild,v 1.1 2006/02/18 11:23:54 azarah Exp $
+
+# TODO:
+#  - fix warning from glibc build system:
+#      /var/tmp/portage/glibc-2.3.6-r2/work/build-x86-x86_64-pc-linux-gnu-nptl/elf/ldconfig: Can't open configuration file /etc/ld.so.conf: No such file or directory
+#  - fix warning from ebuild (amd64 multilib):
+#      mv: cannot stat `/var/tmp/portage/glibc-2.3.6-r2/image//usr/lib32/locale': No such file or directory
+#  - glibc installs a bunch of lib64 stuff into /usr/lib:
+#      qlist glibc | grep ^/usr/lib/ | grep -v /debug/
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+
+#KEYWORDS="~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="-* ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86"
+
+BRANCH_UPDATE=""
+
+# From linuxthreads/man
+GLIBC_MANPAGE_VERSION="2.3.6-1"
+
+# From manual
+GLIBC_INFOPAGE_VERSION="2.3.6"
+
+# Gentoo patchset
+PATCH_VER="1.7"
+
+# C Stubbs addon (contained in fedora, so ignoring)
+#CSTUBS_VER="2.1.2"
+#CSTUBS_TARBALL="c_stubs-${CSTUBS_VER}.tar.bz2"
+#CSTUBS_URI="mirror://gentoo/${CSTUBS_TARBALL}"
+
+# Fedora addons (from RHEL's glibc-2.3.4-2.src.rpm)
+FEDORA_VER="20041219T2331"
+FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2"
+FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}"
+
+GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo"
+GENTOO_TOOLCHAIN_DEV_URI="http://dev.gentoo.org/~azarah/glibc"
+
+### PUNT OUT TO ECLASS?? ###
+inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
+
+DESCRIPTION="GNU libc6 (also called glibc2) C library"
+HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
+LICENSE="LGPL-2"
+
+IUSE="nls pic build nptl nptlonly erandom hardened userlocales multilib selinux glibc-compat20 glibc-omitfp linuxthreads-tls profile"
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	PROVIDE="virtual/libc"
+fi
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+	[[ -z ${_E_CROSS_HEADERS_ONLY} ]] && return 1
+	is_crosscompile
+}
+
+GLIBC_RELEASE_VER=$(get_version_component_range 1-3)
+
+# Don't set this to :-, - allows BRANCH_UPDATE=""
+BRANCH_UPDATE=${BRANCH_UPDATE-$(get_version_component_range 4)}
+
+# (Recent snapshots fails with 2.6.5 and earlier with NPTL)
+NPTL_KERNEL_VERSION=${NPTL_KERNEL_VERSION:-"2.6.9"}
+LT_KERNEL_VERSION=${LT_KERNEL_VERSION:-"2.4.1"}
+
+### SRC_URI ###
+
+# This function handles the basics of setting the SRC_URI for a glibc ebuild.
+# To use, set SRC_URI with:
+#
+#	SRC_URI="$(get_glibc_src_uri)"
+#
+# Other than the variables normally set by portage, this function's behavior
+# can be altered by setting the following:
+#
+#	GENTOO_TOOLCHAIN_BASE_URI
+#			This sets the base URI for all gentoo-specific patch files. Note
+#			that this variable is only important for a brief period of time,
+#			before your source files get picked up by mirrors. However, it is
+#			still highly suggested that you keep files in this location
+#			available.
+#
+#	BRANCH_UPDATE
+#			If set, this variable signals that we should be using the main
+#			release tarball (determined by ebuild version) and applying a
+#			CVS branch update patch against it. The location of this branch
+#			update patch is assumed to be in ${GENTOO_TOOLCHAIN_BASE_URI}.
+#			Just like with SNAPSHOT, this variable is ignored if the ebuild
+#			has a _pre suffix.
+#
+#	PATCH_VER
+#	PATCH_GLIBC_VER
+#			This should be set to the version of the gentoo patch tarball.
+#			The resulting filename of this tarball will be:
+#			glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2
+#
+#	GLIBC_MANPAGE_VERSION
+#	GLIBC_INFOPAGE_VERSION
+#			The version of glibc for which we will download pages. This will
+#			default to ${GLIBC_RELEASE_VER}, but we may not want to pre-generate man pages
+#			for prerelease test ebuilds for example. This allows you to
+#			continue using pre-generated manpages from the last stable release.
+#			If set to "none", this will prevent the downloading of manpages,
+#			which is useful for individual library targets.
+#
+get_glibc_src_uri() {
+	GENTOO_TOOLCHAIN_BASE_URI=${GENTOO_TOOLCHAIN_BASE_URI:-"mirror://gentoo"}
+
+#	GLIBC_SRC_URI="http://ftp.gnu.org/gnu/glibc/glibc-${GLIBC_RELEASE_VER}.tar.bz2
+#	               http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
+#	               http://ftp.gnu.org/gnu/glibc/glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2
+	GLIBC_SRC_URI="mirror://gnu/glibc/glibc-${GLIBC_RELEASE_VER}.tar.bz2
+	               mirror://gnu/glibc/glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
+	               mirror://gnu/glibc/glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2"
+
+	if [[ -n ${BRANCH_UPDATE} ]] ; then
+		GLIBC_SRC_URI="${GLIBC_SRC_URI}
+			${GENTOO_TOOLCHAIN_BASE_URI}/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2"
+		[[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] &&
+			GLIBC_SRC_URI="${GLIBC_SRC_URI}
+				${GENTOO_TOOLCHAIN_DEV_URI}/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2"
+	fi
+
+	if [[ -n ${PATCH_VER} ]] ; then
+		GLIBC_SRC_URI="${GLIBC_SRC_URI}
+			${GENTOO_TOOLCHAIN_BASE_URI}/glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2"
+		[[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] &&
+			GLIBC_SRC_URI="${GLIBC_SRC_URI}
+				${GENTOO_TOOLCHAIN_DEV_URI}/glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2"
+	fi
+
+	if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then
+		GLIBC_SRC_URI="${GLIBC_SRC_URI}
+			${GENTOO_TOOLCHAIN_BASE_URI}/glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2"
+		[[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] &&
+			GLIBC_SRC_URI="${GLIBC_SRC_URI}
+				${GENTOO_TOOLCHAIN_DEV_URI}/glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2"
+	fi
+
+	if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
+		GLIBC_SRC_URI="${GLIBC_SRC_URI}
+			${GENTOO_TOOLCHAIN_BASE_URI}/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2"
+		[[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] &&
+			GLIBC_SRC_URI="${GLIBC_SRC_URI}
+				${GENTOO_TOOLCHAIN_DEV_URI}/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2"
+	fi
+
+	if [[ -n ${CSTUBS_URI} ]] ; then
+		GLIBC_SRC_URI="${GLIBC_SRC_URI} ${CSTUBS_URI}"
+	fi
+
+	if [[ -n ${FEDORA_URI} ]] ; then
+		GLIBC_SRC_URI="${GLIBC_SRC_URI} ${FEDORA_URI}"
+	fi
+
+	echo "${GLIBC_SRC_URI}"
+}
+
+SRC_URI=$(get_glibc_src_uri)
+S=${WORKDIR}/glibc-${GLIBC_RELEASE_VER}
+
+### EXPORTED FUNCTIONS ###
+toolchain-glibc_src_unpack() {
+	# Check NPTL support _before_ we unpack things to save some time
+	want_nptl && check_nptl_support
+
+	unpack glibc-${GLIBC_RELEASE_VER}.tar.bz2
+
+	cd "${S}"
+	unpack glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
+	unpack glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2
+
+	[[ -n ${CSTUBS_TARBALL} ]] && unpack ${CSTUBS_TARBALL}
+	[[ -n ${FEDORA_TARBALL} ]] && unpack ${FEDORA_TARBALL}
+
+	if [[ -n ${PATCH_VER} ]] ; then
+		cd "${WORKDIR}"
+		unpack glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2
+	fi
+
+	# XXX: We should do the branchupdate, before extracting the manpages and
+	# infopages else it does not help much (mtimes change if there is a change
+	# to them with branchupdate)
+	if [[ -n ${BRANCH_UPDATE} ]] ; then
+		cd "${S}"
+		epatch "${DISTDIR}"/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
+
+		# Snapshot date patch
+		einfo "Patching version to display snapshot date ..."
+		sed -i -e "s:\(#define RELEASE\).*:\1 \"${BRANCH_UPDATE}\":" version.h
+	fi
+
+	if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then
+		cd "${WORKDIR}"
+		unpack glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
+	fi
+
+	if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
+		cd "${S}"
+		unpack glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
+	fi
+
+	if [[ -n ${PATCH_VER} ]] ; then
+		cd "${S}"
+		EPATCH_MULTI_MSG="Applying Gentoo Glibc Patchset ${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-${PATCH_VER} ..." \
+		EPATCH_EXCLUDE=${GLIBC_PATCH_EXCLUDE} \
+		EPATCH_SUFFIX="patch" \
+		ARCH=$(tc-arch) \
+		epatch "${WORKDIR}"/patches
+	fi
+}
+
+toolchain-glibc_src_compile() {
+	# Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs
+	local MAKEFLAGS=""
+	has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv"
+
+	echo
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+	echo
+
+	if want_linuxthreads ; then
+		glibc_do_configure linuxthreads
+		einfo "Building GLIBC with linuxthreads..."
+		make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die
+	fi
+	if want_nptl ; then
+		# ... and then do the optional nptl build
+		unset LD_ASSUME_KERNEL
+		glibc_do_configure nptl
+		einfo "Building GLIBC with NPTL..."
+		make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die
+	fi
+}
+
+toolchain-glibc_headers_compile() {
+	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers
+	mkdir -p "${GBUILDDIR}"
+	cd "${GBUILDDIR}"
+
+	# Pick out the correct location for build headers
+	local myconf="--disable-sanity-checks --enable-hacker-mode"
+	myconf="${myconf}
+		--enable-add-ons=linuxthreads
+		--without-cvs
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		--with-headers=$(alt_build_headers)
+		--prefix=$(alt_prefix)
+		--mandir=$(alt_prefix)/share/man
+		--infodir=$(alt_prefix)/share/info
+		--libexecdir=$(alt_prefix)/lib/misc/glibc
+		${EXTRA_ECONF}"
+
+	einfo "Configuring GLIBC headers with: ${myconf// /\n\t\t}"
+	CC=gcc \
+	CFLAGS="-O1 -pipe" \
+	${S}/configure ${myconf} || die "failed to configure glibc"
+}
+
+toolchain-glibc_src_test() {
+	# This is wrong, but glibc's tests fail bad when screwing
+	# around with sandbox, so lets just punt it
+	unset LD_PRELOAD
+
+	# do the linuxthreads build unless we're using nptlonly
+	if want_linuxthreads ; then
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
+		einfo "Checking GLIBC with linuxthreads..."
+		make check || die "linuxthreads glibc did not pass make check"
+	fi
+	if want_nptl ; then
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
+		unset LD_ASSUME_KERNEL || :
+		einfo "Checking GLIBC with NPTL..."
+		make check || die "nptl glibc did not pass make check"
+	fi
+}
+
+toolchain-glibc_pkg_preinst() {
+	# PPC64+others may want to eventually be added to this logic if they
+	# decide to be multilib compatible and FHS compliant. note that this
+	# chunk of FHS compliance only applies to 64bit archs where 32bit
+	# compatibility is a major concern (not IA64, for example).
+
+	# amd64's 2005.0 is the first amd64 profile to not need this code.
+	# 2005.0 is setup properly, and this is executed as part of the
+	# 2004.3 -> 2005.0 upgrade script.
+	# It can be removed after 2004.3 has been purged from portage.
+	{ use amd64 || use ppc64; } && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks
+
+	# it appears that /lib/tls is sometimes not removed. See bug
+	# 69258 for more info.
+	if [[ -d ${ROOT}/$(alt_libdir)/tls ]] && ! { want_nptl && want_linuxthreads; }; then
+		addwrite "${ROOT}"/$(alt_libdir)/
+		ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..."
+		rm -r "${ROOT}"/$(alt_libdir)/tls || die
+	fi
+
+	# Shouldnt need to keep this updated
+	[[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build
+}
+
+toolchain-glibc_src_install() {
+	# Need to dodir first because it might not exist (bad amd64 profiles)
+	dodir $(alt_usrlibdir)
+
+	# These should not be set, else the
+	# zoneinfo do not always get installed ...
+	unset LANGUAGE LANG LC_ALL
+
+	if want_linuxthreads ; then
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
+		einfo "Installing GLIBC ${ABI} with linuxthreads ..."
+		make PARALLELMFLAGS="${MAKEOPTS} -j1" \
+			install_root="${D}" \
+			install || die
+	else # nptlonly
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
+		einfo "Installing GLIBC ${ABI} with NPTL ..."
+		make PARALLELMFLAGS="${MAKEOPTS} -j1" \
+			install_root="${D}" \
+			install || die
+	fi
+
+	if is_crosscompile ; then
+		# punt all the junk not needed by a cross-compiler
+		rm -rf "${D}"$(alt_prefix)/{bin,etc,$(get_libdir)/{gconv,misc},sbin,share}
+	else
+		# zoneinfo stuff is now provided by the timezone-data package
+		rm -rf "${D}"/usr/share/zoneinfo
+		rm -f "${D}"/usr/bin/tzselect
+		rm -f "${D}"/usr/sbin/{zic,zdump}
+	fi
+
+	if want_linuxthreads && want_nptl ; then
+		einfo "Installing NPTL to $(alt_libdir)/tls/..."
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
+		mkdir -p "${D}"$(alt_libdir)/tls/
+
+		libcsofile=$(basename "${D}"$(alt_libdir)/libc-*.so)
+		cp -a libc.so "${D}"$(alt_libdir)/tls/${libcsofile} || die
+		dosym ${libcsofile} $(alt_libdir)/tls/$(ls libc.so.*)
+
+		libmsofile=$(basename "${D}"$(alt_libdir)/libm-*.so)
+		pushd math > /dev/null
+		cp -a libm.so "${D}"$(alt_libdir)/tls/${libmsofile} || die
+		dosym ${libmsofile} $(alt_libdir)/tls/$(ls libm.so.*)
+		popd > /dev/null
+
+		librtsofile=$(basename "${D}"$(alt_libdir)/librt-*.so)
+		pushd rt > /dev/null
+		cp -a librt.so "${D}"$(alt_libdir)/tls/${librtsofile} || die
+		dosym ${librtsofile} $(alt_libdir)/tls/$(ls librt.so.*)
+		popd > /dev/null
+
+		libthreaddbsofile=$(basename "${D}"$(alt_libdir)/libthread_db-*.so)
+		pushd nptl_db > /dev/null
+		cp -a libthread_db.so "${D}"$(alt_libdir)/tls/${libthreaddbsofile} || die
+		dosym ${libthreaddbsofile} $(alt_libdir)/tls/$(ls libthread_db.so.*)
+		popd > /dev/null
+
+		libpthreadsofile=libpthread-${GLIBC_RELEASE_VER}.so
+		cp -a nptl/libpthread.so "${D}"$(alt_libdir)/tls/${libpthreadsofile} || die
+		dosym ${libpthreadsofile} $(alt_libdir)/tls/libpthread.so.0
+
+		# and now for the static libs
+		mkdir -p "${D}"$(alt_usrlibdir)/nptl
+		cp -a libc.a nptl/libpthread.a nptl/libpthread_nonshared.a rt/librt.a \
+			"${D}"$(alt_usrlibdir)/nptl
+
+		# linker script crap
+		for lib in libc libpthread; do
+			sed -e "s:$(alt_libdir)/${lib}.so:$(alt_libdir)/tls/${lib}.so:g" \
+			    -e "s:$(alt_usrlibdir)/${lib}_nonshared.a:$(alt_usrlibdir)/nptl/${lib}_nonshared.a:g" \
+			          "${D}"$(alt_usrlibdir)/${lib}.so \
+				> "${D}"$(alt_usrlibdir)/nptl/${lib}.so
+
+			chmod 755 "${D}"$(alt_usrlibdir)/nptl/${lib}.so
+		done
+
+		dosym ../librt.so $(alt_usrlibdir)/nptl/librt.so
+
+		# last but not least... headers.
+		mkdir -p "${D}"/nptl "${D}"$(alt_headers)/nptl
+		make install_root="${D}"/nptl install-headers PARALLELMFLAGS="${MAKEOPTS} -j1"
+		pushd "${D}"/nptl/$(alt_headers) > /dev/null
+		for i in $(find . -type f) ; do
+			if ! [[ -f ${D}$(alt_headers)/$i ]] \
+			   || ! cmp -s $i ${D}$(alt_headers)/$i; then
+				mkdir -p ${D}$(alt_headers)/nptl/`dirname $i`
+				cp -a $i ${D}$(alt_headers)/nptl/$i
+			fi
+		done
+		popd > /dev/null
+		rm -rf ${D}/nptl
+	fi
+
+	if use pic && [[ $(tc-arch) != "amd64" ]] ; then
+		find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}$(alt_libdir)/soinit.o \;
+		find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}$(alt_libdir)/sofini.o \;
+		find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}$(alt_libdir) \;
+		find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}$(alt_libdir) \;
+
+		for i in ${D}$(alt_libdir)/*.map; do
+			mv ${i} ${i%.map}_pic.map
+		done
+	fi
+
+	# We'll take care of the cache ourselves
+	rm -f ${D}/etc/ld.so.cache
+
+	# Some things want this, notably ash.
+	dosym libbsd-compat.a $(alt_usrlibdir)/libbsd.a
+
+	# Handle includes for different ABIs
+	prep_ml_includes $(alt_headers)
+
+	#################################################################
+	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+	# Make sure we install the sys-include symlink so that when 
+	# we build a 2nd stage cross-compiler, gcc finds the target 
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		dosym include $(alt_prefix)/sys-include
+		dosym . $(alt_prefix)/usr
+		return 0
+	fi
+
+	# Everything past this point just needs to be done once... don't waste time building locale files twice...
+	is_final_abi || return 0
+
+	if want_linuxthreads ; then
+		MYMAINBUILDDIR=build-${ABI}-${CTARGET}-linuxthreads
+	else
+		MYMAINBUILDDIR=build-${ABI}-${CTARGET}-nptl
+	fi
+	cd "${WORKDIR}"/${MYMAINBUILDDIR}
+	if ! use build ; then
+		if ! has noinfo ${FEATURES} && [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
+			einfo "Installing info pages..."
+
+			make PARALLELMFLAGS="${MAKEOPTS} -j1" \
+				install_root=${D} \
+				info -i
+		fi
+
+		setup_locales
+
+		if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then
+			einfo "Installing man pages..."
+
+			# Install linuxthreads man pages even if nptl is enabled
+			cd "${WORKDIR}"/man
+			doman *.3thr
+		fi
+
+		# Install nscd config file
+		insinto /etc
+		doins ${FILESDIR}/nscd.conf
+		doins "${FILESDIR}"/nsswitch.conf
+
+		doinitd "${FILESDIR}"/nscd
+
+		cd ${S}
+		dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE NEWS NOTES PROJECTS README*
+	else
+		rm -rf ${D}/usr/share
+		for dir in $(get_all_libdirs); do
+			rm -rf ${D}/usr/${dir}/gconv &> /dev/null
+		done
+	fi
+
+	# Is this next line actually needed or does the makefile get it right?
+	# It previously has 0755 perms which was killing things.
+	fperms 4711 $(alt_prefix)/lib/misc/glibc/pt_chown
+
+	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
+	# creation of the "factory" symlink in pkg_postinst().
+	rm -f ${D}/etc/localtime
+
+	insinto /etc
+	# This is our new config file for building locales
+	doins ${FILESDIR}/locales.build
+	# example host.conf with multicast dns disabled by default
+	doins ${FILESDIR}/2.3.4/host.conf
+
+	# simple test to make sure our new glibc isnt completely broken.
+	# for now, skip the multilib scenario.  also make sure we don't
+	# test with statically built binaries since they will fail.
+	[[ ${CBUILD} != ${CHOST} ]] && return 0
+	[[ $(get_libdir) != "lib" ]] && return 0
+	for x in date env ls true uname ; do
+		x=$(type -p ${x})
+		[[ -z ${x} ]] && continue
+		striptest=$(file -L ${x} 2>/dev/null)
+		[[ -z ${striptest} ]] && continue
+		[[ ${striptest/statically linked} != "${striptest}" ]] && continue
+		"${D}"/$(get_libdir)/ld-*.so \
+			--library-path "${D}"/$(get_libdir) \
+			${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
+}
+
+toolchain-glibc_headers_install() {
+	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers
+	cd "${GBUILDDIR}"
+	make install_root="${D}" install-headers || die "install-headers failed"
+	# Copy over headers that are not part of install-headers ... these
+	# are pretty much taken verbatim from crosstool, see it for more details
+	insinto $(alt_headers)/bits
+	doins misc/syscall-list.h bits/stdio_lim.h || die "doins include bits"
+	insinto $(alt_headers)/gnu
+	doins "${S}"/include/gnu/stubs.h || die "doins include gnu"
+	# Make sure we install the sys-include symlink so that when 
+	# we build a 2nd stage cross-compiler, gcc finds the target 
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	dosym include $(alt_prefix)/sys-include
+	dosym . $(alt_prefix)/usr
+}
+
+toolchain-glibc_pkg_postinst() {
+	# Mixing nptlonly and -nptlonly glibc can prove dangerous if libpthread
+	# isn't removed in unmerge which happens sometimes.  See bug #87671
+	if ! is_crosscompile && want_linuxthreads ; then
+		for libdir in $(get_all_libdirs) ; do
+			for f in ${ROOT}/${libdir}/libpthread-2.* ${ROOT}/${libdir}/libpthread-0.6* ; do
+				if [[ -f ${f} ]] ; then
+					rm -f ${f}
+					ldconfig
+				fi
+			done
+		done
+	fi
+
+	# Correct me if I am wrong here, but my /etc/localtime is a file
+	# created by zic ....
+	# I am thinking that it should only be recreated if no /etc/localtime
+	# exists, or if it is an invalid symlink.
+	#
+	# For invalid symlink:
+	#   -f && -e  will fail
+	#   -L will succeed
+	#
+	if [ ! -e "${ROOT}/etc/localtime" ] ; then
+		echo "Please remember to set your timezone using the zic command."
+		rm -f ${ROOT}/etc/localtime
+		ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime
+	fi
+
+	if ! is_crosscompile && [ -x "${ROOT}/usr/sbin/iconvconfig" ] ; then
+		# Generate fastloading iconv module configuration file.
+		${ROOT}/usr/sbin/iconvconfig --prefix=${ROOT}
+	fi
+
+	if [ ! -e "${ROOT}/lib/ld.so.1" ] && use ppc64 && ! has_multilib_profile ; then
+		## SHOULDN'T THIS BE lib64??
+		ln -s ld64.so.1 ${ROOT}/lib/ld.so.1
+	fi
+
+	# Reload init ...
+	if ! is_crosscompile && [ "${ROOT}" = "/" ] ; then
+		/sbin/init U &> /dev/null
+	fi
+
+	# warn the few multicast-dns-by-default users we've had about the change
+	# in behavior...
+	echo
+	einfo "Gentoo's glibc now disables multicast dns by default in our"
+	einfo "example host.conf. To re-enable this functionality, simply"
+	einfo "remove the line that disables it (mdns off)."
+	echo
+
+	if want_nptl && want_linuxthreads ; then
+		einfo "The default behavior of glibc on your system is to use NPTL.  If"
+		einfo "you want to use linuxthreads for a particular program, start it"
+		einfo "by executing 'LD_ASSUME_KERNEL=${LT_KERNEL_VERSION} <program> [<options>]'"
+		echo
+	fi
+}
+
+### SUPPORT FUNCTIONS ###
+# We need to be able to set alternative headers for
+# compiling for non-native platform
+# Will also become useful for testing kernel-headers without screwing up
+# the whole system.
+# note: intentionally undocumented.
+alt_headers() {
+	if [[ -z ${ALT_HEADERS} ]] ; then
+		if is_crosscompile ; then
+			ALT_HEADERS="/usr/${CTARGET}/include"
+		else
+			ALT_HEADERS="/usr/include"
+		fi
+	fi
+	echo "${ALT_HEADERS}"
+}
+alt_build_headers() {
+	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
+		ALT_BUILD_HEADERS=$(alt_headers)
+		tc-is-cross-compiler && ALT_BUILD_HEADERS=${ROOT}$(alt_headers)
+	fi
+	echo "${ALT_BUILD_HEADERS}"
+}
+
+alt_prefix() {
+	if is_crosscompile ; then
+		echo /usr/${CTARGET}
+	else
+		echo /usr
+	fi
+}
+
+alt_libdir() {
+	if is_crosscompile ; then
+		echo /usr/${CTARGET}/$(get_libdir)
+	else
+		echo /$(get_libdir)
+	fi
+}
+
+alt_usrlibdir() {
+	if is_crosscompile ; then
+		echo /usr/${CTARGET}/$(get_libdir)
+	else
+		echo /usr/$(get_libdir)
+	fi
+}
+
+setup_flags() {
+	# Make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+
+	# Store our CFLAGS because it's changed depending on which CTARGET
+	# we are building when pulling glibc on a multilib profile
+	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
+	CFLAGS=${CFLAGS_BASE}
+	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
+	ASFLAGS=${ASFLAGS_BASE}
+
+	# Over-zealous CFLAGS can often cause problems.  What may work for one
+	# person may not work for another.  To avoid a large influx of bugs
+	# relating to failed builds, we strip most CFLAGS out to ensure as few
+	# problems as possible.
+	strip-flags
+	strip-unsupported-flags
+	filter-flags -m32 -m64 -mabi=*
+
+	unset CBUILD_OPT CTARGET_OPT
+	if has_multilib_profile ; then
+		CTARGET_OPT=$(get_abi_CTARGET)
+		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+	fi
+
+	case $(tc-arch) in
+		amd64)
+			# Punt this when amd64's 2004.3 is removed
+			CFLAGS_x86="-m32"
+		;;
+		ppc)
+			append-flags "-freorder-blocks"
+		;;
+		sparc)
+			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
+			filter-flags "-fcall-used-g7"
+			append-flags "-fcall-used-g6"
+			filter-flags "-mvis"
+
+			if is_crosscompile || [[ ${PROFILE_ARCH} == "sparc64" ]] || { has_multilib_profile && ! tc-is-cross-compiler; } ; then
+				case ${ABI} in
+					sparc64)
+						filter-flags -Wa,-xarch -Wa,-A
+
+						if is-flag "-mcpu=ultrasparc3"; then
+							CTARGET_OPT="sparc64b-unknown-linux-gnu"
+							append-flags "-Wa,-xarch=v9b"
+							export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b"
+						else
+							CTARGET_OPT="sparc64-unknown-linux-gnu"
+							append-flags "-Wa,-xarch=v9a"
+							export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9a"
+						fi
+					;;
+					*)
+						if is-flag "-mcpu=ultrasparc3"; then
+							CTARGET_OPT="sparcv9b-unknown-linux-gnu"
+						else
+							CTARGET_OPT="sparcv9-unknown-linux-gnu"
+						fi
+					;;
+				esac
+			else
+				if is-flag "-mcpu=ultrasparc3"; then
+					CTARGET_OPT="sparcv9b-unknown-linux-gnu"
+				elif { is_crosscompile && want_nptl; } || is-flag "-mcpu=ultrasparc2" || is-flag "-mcpu=ultrasparc"; then
+					CTARGET_OPT="sparcv9-unknown-linux-gnu"
+				fi
+			fi
+		;;
+	esac
+
+	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
+		CBUILD_OPT=${CTARGET_OPT}
+	fi
+
+	if $(tc-getCC ${CTARGET}) -v 2>&1 | grep -q 'gcc version 3.[0123]'; then
+		append-flags -finline-limit=2000
+	fi
+
+	# We dont want these flags for glibc
+	filter-ldflags -pie
+
+	# We cannot build glibc with Bdirect support
+	filter-flags -Wl,-Bdirect
+	filter-ldflags -Bdirect
+	filter-ldflags -Wl,-Bdirect
+
+	# Same for hashvals ...
+	filter-flags -Wl,-hashvals
+	filter-ldflags -hashvals
+	filter-ldflags -Wl,-hashvals
+
+	# Lock glibc at -O2 -- linuxthreads needs it and we want to be
+	# conservative here
+	filter-flags -O?
+	append-flags -O2
+}
+
+check_kheader_version() {
+	local header="$(alt_build_headers)/linux/version.h"
+
+	[[ -z $1 ]] && return 1
+
+	if [ -f "${header}" ] ; then
+		local version="`grep 'LINUX_VERSION_CODE' ${header} | \
+			sed -e 's:^.*LINUX_VERSION_CODE[[:space:]]*::'`"
+
+		if [ "${version}" -ge "$1" ] ; then
+			return 0
+		fi
+	fi
+
+	return 1
+}
+
+check_nptl_support() {
+	local min_kernel_version="$(KV_to_int "${NPTL_KERNEL_VERSION}")"
+
+	echo
+
+	einfon "Checking gcc for __thread support ... "
+	if want__thread ; then
+		echo "yes"
+	else
+		echo "no"
+		echo
+		eerror "Could not find a gcc that supports the __thread directive!"
+		eerror "please update to gcc-3.2.2-r1 or later, and try again."
+		die "No __thread support in gcc!"
+	fi
+
+	# Building fails on an non-supporting kernel
+	einfon "Checking kernel version (>=${NPTL_KERNEL_VERSION}) ... "
+	if [ "`get_KV`" -lt "${min_kernel_version}" ] ; then
+		echo "no"
+		echo
+		eerror "You need a kernel of at least version ${NPTL_KERNEL_VERSION}"
+		eerror "for NPTL support!"
+		die "Kernel version too low!"
+	else
+		echo "yes"
+	fi
+
+	# Building fails with too low linux-headers
+	einfon "Checking linux-headers version (>=${NPTL_KERNEL_VERSION}) ... "
+	if ! check_kheader_version "${min_kernel_version}"; then
+		echo "no"
+		echo
+		eerror "You need linux-headers of at least version ${NPTL_KERNEL_VERSION}"
+		eerror "for NPTL support!"
+		die "linux-headers version too low!"
+	else
+		echo "yes"
+	fi
+
+	echo
+}
+
+want_nptl() {
+	want_tls || return 1
+	use nptl || return 1
+
+	# Archs that can use NPTL
+	case $(tc-arch) in
+		alpha|amd64|ia64|mips|ppc|ppc64|s390|sh|x86)
+			return 0;
+		;;
+		sparc)
+			# >= v9 is needed for nptl.
+			[[ "${PROFILE_ARCH}" == "sparc" ]] && return 1
+			return 0;
+		;;
+	esac
+
+	return 1
+}
+
+want_linuxthreads() {
+	! use nptlonly && return 0
+	want_nptl || return 0
+	return 1
+}
+
+want_tls() {
+	# Archs that can use TLS (Thread Local Storage)
+	case $(tc-arch) in
+		alpha|amd64|ia64|mips|ppc|ppc64|s390|sh)
+			return 0;
+		;;
+		sparc)
+			# 2.3.6 should have tls support on sparc64
+			# when using newer binutils
+			case ${CTARGET/-*} in
+				sparc64*) return 1 ;;
+				*) return 0 ;;
+			esac
+		;;
+		x86)
+			# requires i486 or better #106556
+			[[ ${CTARGET} == i[4567]86* ]] && return 0
+		;;
+	esac
+
+	return 1
+}
+
+want__thread() {
+	want_tls || return 1
+
+	# For some reason --with-tls --with__thread is causing segfaults on sparc32.
+	[[ ${PROFILE_ARCH} == "sparc" ]] && return 1
+
+	[[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}
+
+	$(tc-getCC ${CTARGET}) -c ${FILESDIR}/test-__thread.c -o ${T}/test2.o &> /dev/null
+	WANT__THREAD=$?
+
+	return ${WANT__THREAD}
+}
+
+install_locales() {
+	unset LANGUAGE LANG LC_ALL
+	cd "${WORKDIR}"/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}"
+	make PARALLELMFLAGS="${MAKEOPTS} -j1" \
+		install_root=${D} localedata/install-locales || die
+}
+
+setup_locales() {
+	if use !userlocales ; then
+		einfo "userlocales not enabled, installing -ALL- locales..."
+		install_locales || die
+	elif [ -e /etc/locales.build ] ; then
+		einfo "Installing locales in /etc/locales.build..."
+		echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales
+		cat /etc/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \
+			>> SUPPORTED.locales
+		cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die
+		install_locales || die
+	elif [ -e ${FILESDIR}/locales.build ] ; then
+		einfo "Installing locales in ${FILESDIR}/locales.build..."
+		echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales
+		cat ${FILESDIR}/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \
+			>> SUPPORTED.locales
+		cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die
+		install_locales || die
+	else
+		einfo "Installing -ALL- locales..."
+		install_locales || die
+	fi
+}
+
+glibc_do_configure() {
+	local myconf
+
+	# set addons
+	pushd ${S} > /dev/null
+	ADDONS=$(echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\|glibc-compat\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d')
+	use glibc-compat20 && [[ -d glibc-compat ]] && ADDONS="${ADDONS},glibc-compat"
+	popd > /dev/null
+
+	use nls || myconf="${myconf} --disable-nls"
+	use erandom || myconf="${myconf} --disable-dev-erandom"
+
+	use glibc-omitfp && myconf="${myconf} --enable-omitfp"
+
+	[[ ${CTARGET} == *-softfloat-* ]] && myconf="${myconf} --without-fp"
+
+	if [ "$1" == "linuxthreads" ] ; then
+		if want_tls && [[ ${CTARGET} != i[45]86-* ]] ; then
+			myconf="${myconf} --with-tls"
+
+			if want__thread && use linuxthreads-tls ; then
+				myconf="${myconf} --with-__thread"
+			else
+				myconf="${myconf} --without-__thread"
+			fi
+		else
+			myconf="${myconf} --without-tls --without-__thread"
+		fi
+
+		myconf="${myconf} --enable-add-ons=linuxthreads${ADDONS}"
+		myconf="${myconf} --enable-kernel=${LT_KERNEL_VERSION}"
+	elif [ "$1" == "nptl" ] ; then
+		myconf="${myconf} --with-tls --with-__thread"
+		myconf="${myconf} --enable-add-ons=nptl${ADDONS}"
+		myconf="${myconf} --enable-kernel=${NPTL_KERNEL_VERSION}"
+	else
+		die "invalid pthread option"
+	fi
+
+	# Since SELinux support is only required for nscd, only enable it if:
+	# 1. USE selinux
+	# 2. ! USE build
+	# 3. only for the primary ABI on multilib systems
+	if use selinux && ! use build; then
+		if use multilib || has_multilib_profile; then
+			if is_final_abi; then
+				myconf="${myconf} --with-selinux"
+			else
+				myconf="${myconf} --without-selinux"
+			fi
+		else
+			myconf="${myconf} --with-selinux"
+		fi
+	else
+		myconf="${myconf} --without-selinux"
+	fi
+
+	# Pick out the correct location for build headers
+	myconf="${myconf}
+		--without-cvs
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		$(use_enable profile)
+		--without-gd
+		--with-headers=$(alt_build_headers)
+		--prefix=$(alt_prefix)
+		--mandir=$(alt_prefix)/share/man
+		--infodir=$(alt_prefix)/share/info
+		--libexecdir=$(alt_prefix)/lib/misc/glibc
+		${EXTRA_ECONF}"
+
+	has_version app-admin/eselect-compiler || export CC="$(tc-getCC ${CTARGET})"
+
+	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
+	mkdir -p ${GBUILDDIR}
+	cd ${GBUILDDIR}
+	einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}"
+	${S}/configure ${myconf} || die "failed to configure glibc"
+}
+
+fix_lib64_symlinks() {
+	# the original Gentoo/AMD64 devs decided that since 64bit is the native
+	# bitdepth for AMD64, lib should be used for 64bit libraries. however,
+	# this ignores the FHS and breaks multilib horribly... especially
+	# since it wont even work without a lib64 symlink anyways. *rolls eyes*
+	# see bug 59710 for more information.
+	# Travis Tilley <lv@gentoo.org> (08 Aug 2004)
+	if [ -L ${ROOT}/lib64 ] ; then
+		ewarn "removing /lib64 symlink and moving lib to lib64..."
+		ewarn "dont hit ctrl-c until this is done"
+		addwrite ${ROOT}/
+		rm ${ROOT}/lib64
+		# now that lib64 is gone, nothing will run without calling ld.so
+		# directly. luckily the window of brokenness is almost non-existant
+		use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64
+		use ppc64 && /lib/ld64.so.1 /bin/mv ${ROOT}/lib ${ROOT}/lib64
+		# all better :)
+		ldconfig
+		ln -s lib64 ${ROOT}/lib
+		einfo "done! :-)"
+		einfo "fixed broken lib64/lib symlink in ${ROOT}"
+	fi
+	if [ -L ${ROOT}/usr/lib64 ] ; then
+		addwrite ${ROOT}/usr
+		rm ${ROOT}/usr/lib64
+		mv ${ROOT}/usr/lib ${ROOT}/usr/lib64
+		ln -s lib64 ${ROOT}/usr/lib
+		einfo "fixed broken lib64/lib symlink in ${ROOT}/usr"
+	fi
+	if [ -L ${ROOT}/usr/X11R6/lib64 ] ; then
+		addwrite ${ROOT}/usr/X11R6
+		rm ${ROOT}/usr/X11R6/lib64
+		mv ${ROOT}/usr/X11R6/lib ${ROOT}/usr/X11R6/lib64
+		ln -s lib64 ${ROOT}/usr/X11R6/lib
+		einfo "fixed broken lib64/lib symlink in ${ROOT}/usr/X11R6"
+	fi
+}
+
+use_multilib() {
+	case ${CTARGET} in
+		sparc64*|mips64*|x86_64*|powerpc64*|s390x*)
+			has_multilib_profile || use multilib ;;
+		*)  false ;;
+	esac
+}
+
+# Setup toolchain variables that would be defined in the profiles for these archs.
+setup_env() {
+	# These should not be set, else the zoneinfo do not always get installed ...
+	unset LANGUAGE LANG LC_ALL
+	# silly users
+	unset LD_RUN_PATH
+
+	if is_crosscompile || tc-is-cross-compiler ; then
+		multilib_env ${CTARGET}
+		if ! use multilib ; then
+			MULTILIB_ABIS=${DEFAULT_ABI}
+		else
+			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
+		fi
+
+		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
+		# and fall back on CFLAGS.
+		local VAR=CFLAGS_${CTARGET//[-.]/_}
+		CFLAGS=${!VAR-${CFLAGS}}
+	fi
+
+	setup_flags
+
+	export ABI=${ABI:-${DEFAULT_ABI:-default}}
+
+	if is_crosscompile || tc-is-cross-compiler ; then
+		local VAR=CFLAGS_${ABI}
+		# We need to export CFLAGS with abi information in them because
+		# glibc's configure script checks CFLAGS for some targets (like mips)
+		export CFLAGS="${!VAR} ${CFLAGS}"
+	fi
+}
+
+### /ECLASS PUNTAGE ###
+
+if is_crosscompile ; then
+	SLOT="${CTARGET}-2.2"
+else
+	SLOT="2.2"
+fi
+
+# we'll handle stripping ourself #46186
+RESTRICT="nostrip multilib-pkg-force"
+
+# We need a new-enough binutils for as-needed
+DEPEND=">=sys-devel/gcc-3.3.3
+	nptl? ( >=sys-kernel/linux-headers-2.6.5 )
+	>=sys-devel/binutils-2.15.94
+	>=sys-devel/gcc-config-1.3.12
+	virtual/os-headers
+	nls? ( sys-devel/gettext )
+	selinux? ( !build? ( sys-libs/libselinux ) )"
+RDEPEND="nls? ( sys-devel/gettext )
+	selinux? ( !build? ( sys-libs/libselinux ) )"
+
+if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+	DEPEND="${DEPEND} ${CATEGORY}/gcc"
+
+	if [[ ${CATEGORY} == *-linux* ]] ; then
+		if [[ ${CATEGORY} == cross-mips* ]] ; then
+			DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10"
+		else
+			DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
+		fi
+	fi
+else
+	DEPEND="${DEPEND} sys-libs/timezone-data"
+	RDEPEND="${RDEPEND} sys-libs/timezone-data"
+fi
+
+pkg_setup() {
+	if portageq has_version / '>=sys-libs/glibc-2.3.5.20050201' && \
+	   portageq	has_version / '<sys-libs/glibc-2.3.6' ; then
+		eerror "Portage have a serious bug in regards to symlinks, and merging"
+		eerror "this with current versions will fail!  See:"
+		echo
+		eerror "  http://bugs.gentoo.org/show_bug.cgi?id=112082"
+		echo
+		eerror "If you want to update, please apply this patch:"
+		echo
+		eerror "  http://bugs.gentoo.org/attachment.cgi?id=72643"
+		echo
+		eerror "to '/usr/$(get_libdir)/portage/portage.py' and"
+		eerror "comment the die() below."
+		echo
+		ebeep
+		die "Might break upgrading."
+	fi
+
+	if use nptlonly && ! use nptl ; then
+		eerror "If you want nptlonly, add nptl to your USE too ;p"
+		die "nptlonly without nptl"
+	fi
+
+	# give some sort of warning about the nptl logic changes...
+	if want_nptl && want_linuxthreads ; then
+
+		ewarn "Warning! Gentoo's GLIBC with NPTL enabled now behaves like the"
+		ewarn "glibc from almost every other distribution out there. This means"
+		ewarn "that glibc is compiled -twice-, once with linuxthreads and once"
+		ewarn "with nptl. The NPTL version is installed to lib/tls and is still"
+		ewarn "used by default. If you do not need nor want the linuxthreads"
+		ewarn "fallback, you can disable this behavior by adding nptlonly to"
+		ewarn "USE to save yourself some compile time."
+
+		ebeep
+		epause 5
+	fi
+}
+
+src_unpack() {
+	setup_env
+
+	case $(tc-arch) in
+		hppa)
+			GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 2000-all-2.3.2-propolice-guard-functions-v3.patch"
+			use hardened || GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6490_hppa_hardened-disable__init_arrays.patch"
+		;;
+		mips)
+			GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 3000-all-2.3.4-dl_execstack-PaX-support.patch 6640_mips_unistd_h-fixes.patch"
+			use_multilib \
+				&& GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6680_mips_nolib3264.patch" \
+				|| GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5005_all_enable-multilib-with-cross-compile.patch"
+		;;
+		amd64)
+			if ! has_multilib_profile && ! is_crosscompile ; then
+				# the gentoo-libdir patch hack conflicts with these
+				GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5005_all_enable-multilib-with-cross-compile.patch"
+			fi
+		;;
+	esac
+
+	# Do not enable -Bdirect support for now.
+	GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 2020_all_2.3.6-hashvals.patch"
+	GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 2030_all_2.3.6-bdirect.patch"
+
+	toolchain-glibc_src_unpack
+
+	# XXX: do not package ssp up into tarballs, leave it in FILESDIR
+	cd "${S}"
+	cp "${FILESDIR}"/2.3.5/ssp.c sysdeps/unix/sysv/linux/ || die "could not find ssp.c"
+	rm -f "${WORKDIR}"/patches/2*
+	epatch "${FILESDIR}"/2.3.6/glibc-2.3.6-propolice-guard-functions.patch
+	epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-frandom-detect.patch
+
+	case $(tc-arch) in
+		alpha)
+			# Is this still needed?
+			rm -f sysdeps/alpha/alphaev6/memcpy.S
+		;;
+		amd64)
+			if ! has_multilib_profile && ! is_crosscompile; then
+				# CONF_LIBDIR support
+				epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch
+				sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" ${S}/sysdeps/unix/sysv/linux/configure
+			fi
+		;;
+		ppc64)
+			# setup lib -- seems like a good place to set this up
+			has_multilib_profile || get_libdir_override lib64
+		;;
+	esac
+
+	# Glibc is stupid sometimes, and doesn't realize that with a
+	# static C-Only gcc, -lgcc_eh doesn't exist.
+	# http://sources.redhat.com/ml/libc-alpha/2003-09/msg00100.html
+	# http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html
+	echo 'int main(){}' > ${T}/gcc_eh_test.c
+	if ! $(tc-getCC ${CTARGET}) ${T}/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then
+		sed -i -e 's:-lgcc_eh::' Makeconfig || die "sed gcc_eh"
+	fi
+
+	# Some configure checks fail on the first emerge through because they
+	# try to link.  This doesn't work well if we don't have a libc yet.
+	# http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html
+	if is_crosscompile && use build; then
+		rm ${S}/sysdeps/sparc/sparc64/elf/configure{,.in}
+		rm ${S}/nptl/sysdeps/pthread/configure{,.in}
+	fi
+
+	cd "${WORKDIR}"
+	find . -type f '(' -size 0 -o -name "*.orig" ')' -exec rm -f {} \;
+	find . -name configure -exec touch {} \;
+
+	# Fix permissions on some of the scripts
+	chmod u+x "${S}"/scripts/*.sh
+}
+
+src_compile() {
+	setup_env
+
+	if [[ -z ${OABI} ]] ; then
+		local abilist=""
+		if has_multilib_profile ; then
+			abilist=$(get_install_abis)
+			einfo "Building multilib glibc for ABIs: ${abilist}"
+		elif is_crosscompile || tc-is-cross-compiler ; then
+			abilist=${DEFAULT_ABI}
+		fi
+		if [[ -n ${abilist} ]] ; then
+			OABI=${ABI}
+			for ABI in ${abilist} ; do
+				export ABI
+				src_compile
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+	fi
+
+	if just_headers ; then
+		toolchain-glibc_headers_compile
+	else
+		toolchain-glibc_src_compile
+	fi
+}
+
+src_test() {
+	setup_env
+
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		OABI=${ABI}
+		einfo "Testing multilib glibc for ABIs: $(get_install_abis)"
+		for ABI in $(get_install_abis) ; do
+			export ABI
+			einfo "   Testing ${ABI} glibc"
+			src_test
+		done
+		ABI=${OABI}
+		unset OABI
+		return 0
+	fi
+
+	toolchain-glibc_src_test
+}
+
+src_strip() {
+	# Now, strip everything but the thread libs #46186, as well as the dynamic
+	# linker, else we cannot set breakpoints in shared libraries due to bugs in
+	# gdb.  Also want to grab stuff in tls subdir.  whee.
+#when new portage supports this ...
+#	env \
+#		-uRESTRICT \
+#		CHOST=${CTARGET} \
+#		STRIP_MASK="/*/{,tls/}{ld-,lib{pthread,thread_db}}*" \
+#		prepallstrip
+	pushd "${D}" > /dev/null
+
+	if ! is_crosscompile ; then
+		mkdir -p "${T}"/strip-backup
+		for x in $(find "${D}" -maxdepth 3 \
+		           '(' -name 'ld-*' -o -name 'libpthread*' -o -name 'libthread_db*' ')' \
+		           -a '(' '!' -name '*.a' ')' -type f -printf '%P ')
+		do
+			mkdir -p "${T}/strip-backup/${x%/*}"
+			cp -a -- "${D}/${x}" "${T}/strip-backup/${x}" || die "backing up ${x}"
+		done
+	fi
+	env -uRESTRICT CHOST=${CTARGET} prepallstrip
+	if ! is_crosscompile ; then
+		cp -a -- "${T}"/strip-backup/* "${D}"/ || die "restoring non-stripped libs"
+	fi
+
+	popd > /dev/null
+}
+
+src_install() {
+	setup_env
+
+	if [[ -z ${OABI} ]] ; then
+		local abilist=""
+		if has_multilib_profile ; then
+			abilist=$(get_install_abis)
+			einfo "Installing multilib glibc for ABIs: ${abilist}"
+		elif is_crosscompile || tc-is-cross-compiler ; then
+			abilist=${DEFAULT_ABI}
+		fi
+		if [[ -n ${abilist} ]] ; then
+			OABI=${ABI}
+			for ABI in ${abilist} ; do
+				export ABI
+				src_install
+			done
+			ABI=${OABI}
+			unset OABI
+			src_strip
+			return 0
+		fi
+	fi
+
+	# Handle stupid lib32 BS
+	unset OLD_LIBDIR
+	if ! is_crosscompile ; then
+		if [[ $(tc-arch) == "amd64" && ${ABI} == "x86" && $(get_libdir) != "lib" ]] ; then
+			OLD_LIBDIR=$(get_libdir)
+			LIBDIR_x86="lib"
+		fi
+
+		if [[ $(tc-arch) == "ppc64" && ${ABI} == "ppc" && $(get_libdir) != "lib" ]] ; then
+			OLD_LIBDIR=$(get_libdir)
+			LIBDIR_ppc="lib"
+		fi
+	fi
+
+	if just_headers ; then
+		toolchain-glibc_headers_install
+	else
+		toolchain-glibc_src_install
+	fi
+	[[ -z ${OABI} ]] && src_strip
+
+	# Handle stupid lib32 BS on amd64 and ppc64
+	if [[ -n ${OLD_LIBDIR} ]] ; then
+		cd "${S}"
+		[[ $(tc-arch) == "amd64" ]] && LIBDIR_x86=${OLD_LIBDIR}
+		[[ $(tc-arch) == "ppc64" ]] && LIBDIR_ppc=${OLD_LIBDIR}
+		unset OLD_LIBDIR
+
+		mv "${D}"/lib "${D}"/$(get_libdir)
+		mv "${D}"/usr/lib "${D}"/usr/$(get_libdir)
+		dodir /lib
+		dodir /usr/lib
+		mv "${D}"/usr/$(get_libdir)/locale "${D}"/usr/lib
+		[[ $(tc-arch) == "amd64" ]] && dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2
+		[[ $(tc-arch) == "ppc64" ]] && dosym ../$(get_libdir)/ld.so.1 /lib/ld.so.1
+
+		for f in "${D}"/usr/$(get_libdir)/*.so; do
+			local basef=$(basename "${f}")
+			if [[ -L ${f} ]] ; then
+				local target=$(readlink "${f}")
+				target=${target/\/lib\//\/$(get_libdir)\/}
+				rm "${f}"
+				dosym "${target}" /usr/$(get_libdir)/"${basef}"
+			fi
+		done
+
+		dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/lib{c,pthread}.so
+
+		if want_nptl && want_linuxthreads ; then
+			dosed  "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/nptl/lib{c,pthread}.so
+		fi
+	fi
+
+	# PPC NPTL fix
+	if [[ $(tc-arch) == "ppc" ]] && use nptl && ! use nptlonly ; then
+		cp ${WORKDIR}/build-default-${CTARGET}-nptl/elf/ld.so ${D}/lib/ld-${PV}.so
+	fi
+}
+
+pkg_preinst() {
+	toolchain-glibc_pkg_preinst
+}
+
+pkg_postinst() {
+	toolchain-glibc_pkg_postinst
+}