From 7714034bca4341c43f4b0829dedcb1cf564ccd19 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 12 Mar 2006 11:22:40 +0000
Subject: [PATCH] update gcc requirement and change tls check to default to 0
 for everyone Package-Manager: portage-2.1_pre6

---
 sys-libs/glibc/Manifest         | 12 ++++++------
 sys-libs/glibc/glibc-2.4.ebuild | 12 +++++-------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 83a0edf03553..bb029845add4 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -421,16 +421,16 @@ SHA256 f41912c160b24e166391e32106846e9ad0509215034101c521cf559bbe7e38dd glibc-2.
 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 c38fd03b0303e9554e94f26584b815c3 glibc-2.4.ebuild 42765
-RMD160 d7c2c15aa77afb7d9de70787f394230cf2f800ab glibc-2.4.ebuild 42765
-SHA256 4ad99e9a479b72cbd046930a67fd2a73da1667d4b146c866a555b421ad356214 glibc-2.4.ebuild 42765
+MD5 9c589540e2f8a01807e6d9fbe5299804 glibc-2.4.ebuild 42683
+RMD160 6fb56affee09760d7c0db701718da8552305aac1 glibc-2.4.ebuild 42683
+SHA256 311b0f5676c81f2e729d8520b8462d66f4eaa852f9865440d8234d200647849e glibc-2.4.ebuild 42683
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a metadata.xml 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEEq7G2+ySkm8kpY0RAoOcAJ94ckNTzr7tpD8lwP7qEcqGCPxRygCfeYsi
-ibNcspvlWoLHfI4y+YAJzRk=
-=34Kq
+iD8DBQFEFATz2+ySkm8kpY0RAhM8AJ9wJtzh6ySfgzz9ULqLAps4aeEVEACePIdS
+rLtjKaOGkdnkZJak2U+Pl6E=
+=5Gy2
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.4.ebuild b/sys-libs/glibc/glibc-2.4.ebuild
index 7d949a1740f9..775860d4c9cb 100644
--- a/sys-libs/glibc/glibc-2.4.ebuild
+++ b/sys-libs/glibc/glibc-2.4.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.5 2006/03/11 11:02:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4.ebuild,v 1.6 2006/03/12 11:22:40 vapier Exp $
 
 # TODO:
 #  - fix warning from glibc build system:
@@ -842,9 +842,6 @@ want_linuxthreads() {
 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
@@ -856,10 +853,11 @@ want_tls() {
 		x86)
 			# requires i486 or better #106556
 			[[ ${CTARGET} == i[4567]86* ]] && return 0
+			return 1
 		;;
 	esac
 
-	return 1
+	return 0
 }
 
 want__thread() {
@@ -936,7 +934,7 @@ glibc_do_configure() {
 	[[ ${CTARGET} == *-softfloat-* ]] && myconf="${myconf} --without-fp"
 
 	if [ "$1" == "linuxthreads" ] ; then
-		if want_tls && [[ ${CTARGET} != i[45]86-* ]] ; then
+		if want_tls ; then
 			myconf="${myconf} --with-tls"
 
 			if want__thread && use linuxthreads-tls ; then
@@ -1092,7 +1090,7 @@ RESTRICT="nostrip multilib-pkg-force"
 
 # General: We need a new-enough binutils for as-needed
 # arch: we need to make sure our binutils/gcc supports TLS
-DEPEND=">=sys-devel/gcc-3.3.3
+DEPEND=">=sys-devel/gcc-3.4.4
 	arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 )
 	nptl? ( >=sys-kernel/linux-headers-2.6.5 )
 	>=sys-devel/binutils-2.15.94
-- 
2.26.2