From 203adbb5ccfda17a26aa15999f37bb1ed028994b Mon Sep 17 00:00:00 2001
From: steve <none@none>
Date: Wed, 15 Nov 2006 14:31:34 +0000
Subject: [PATCH] 2006-11-15 14:31:33 by steve   Don't touch TLS if we're on a
 64 bit host.

  See #397933
---
 hooks/centos4/10-disable-tls |  9 +++++++++
 hooks/debian/20-setup-apt    | 29 ++++++++++++++++++-----------
 hooks/fedora/10-disable-tls  |  9 +++++++++
 hooks/gentoo/10-disable-tls  |  9 +++++++++
 4 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/hooks/centos4/10-disable-tls b/hooks/centos4/10-disable-tls
index 70471ab..a80edd6 100755
--- a/hooks/centos4/10-disable-tls
+++ b/hooks/centos4/10-disable-tls
@@ -27,6 +27,15 @@ fi
 logMessage Script $0 starting
 
 
+#
+# Don't touch TLS on 64 bit platforms.
+#
+if [ "`uname -m`" = "x86_64" ]; then
+    logMessage "Ignoring TLS since we're a 64 bit host."
+    exit
+fi
+
+
 #
 # Disable TLS and create an empty directory in its place
 # 
diff --git a/hooks/debian/20-setup-apt b/hooks/debian/20-setup-apt
index bba6c2d..50a7c60 100755
--- a/hooks/debian/20-setup-apt
+++ b/hooks/debian/20-setup-apt
@@ -95,18 +95,25 @@ chroot ${prefix} /usr/bin/apt-get update
 #
 # For sarge we don't have that option, so we disable TLS.
 #
-case "${dist}" in
-    etch|sid)
-        logMessage "Installing xen-aware libc6"
+if [ "`uname -m`" = "x86_64" ]; then
 
-        installDebianPackage ${prefix} libc6-xen
-        ;;
-    *)
-        logMessage "Disabling TLS"
-        mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled
-        mkdir ${prefix}/lib/tls
-        ;;
-esac
+    logMessage "Ignoring TLS since we're a 64 bit host."
+
+else
+
+    case "${dist}" in
+	etch|sid)
+            logMessage "Installing xen-aware libc6"
+	    
+            installDebianPackage ${prefix} libc6-xen
+            ;;
+	*)
+            logMessage "Disabling TLS"
+            mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled
+            mkdir ${prefix}/lib/tls
+            ;;
+    esac
+fi
 
 
 
diff --git a/hooks/fedora/10-disable-tls b/hooks/fedora/10-disable-tls
index 70471ab..2f00edf 100755
--- a/hooks/fedora/10-disable-tls
+++ b/hooks/fedora/10-disable-tls
@@ -27,6 +27,15 @@ fi
 logMessage Script $0 starting
 
 
+
+#
+# Don't touch TLS on 64 bit platforms.
+#
+if [ "`uname -m`" = "x86_64" ]; then
+    logMessage "Ignoring TLS since we're a 64 bit host."
+    exit
+fi
+
 #
 # Disable TLS and create an empty directory in its place
 # 
diff --git a/hooks/gentoo/10-disable-tls b/hooks/gentoo/10-disable-tls
index e53b33b..c591982 100755
--- a/hooks/gentoo/10-disable-tls
+++ b/hooks/gentoo/10-disable-tls
@@ -26,6 +26,15 @@ logMessage Script $0 starting
 
 
 
+#
+# Don't touch TLS on 64 bit platforms.
+#
+if [ "`uname -m`" = "x86_64" ]; then
+    logMessage "Ignoring TLS since we're a 64 bit host."
+    exit
+fi
+
+
 #
 # Disable TLS and create an empty directory in its place
 #