diff --git a/ChangeLog.tile b/ChangeLog.tile
index 2ce98e971b..5cdc293f8e 100644
--- a/ChangeLog.tile
+++ b/ChangeLog.tile
@@ -1,3 +1,7 @@
+2012-05-12  Chris Metcalf  <cmetcalf@tilera.com>
+
+	* sysdeps/tile/__tls_get_addr.S: Use __WORDSIZE, not _LP64.
+
 2012-05-12  Chris Metcalf  <cmetcalf@tilera.com>
 
 	* sysdeps/tile/stackguard-macros.h: New file.
diff --git a/sysdeps/tile/__tls_get_addr.S b/sysdeps/tile/__tls_get_addr.S
index 8cf49f0b2b..74e4fa2c26 100644
--- a/sysdeps/tile/__tls_get_addr.S
+++ b/sysdeps/tile/__tls_get_addr.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
 
@@ -18,8 +18,9 @@
 
 #include <sysdep.h>
 #include <tls.h>
+#include <bits/wordsize.h>
 
-#ifdef _LP64
+#if __WORDSIZE == 64
 #define LOG_SIZEOF_DTV_T 4
 #else
 #define LOG_SIZEOF_DTV_T 3