commit 1e52a54a47c00af689b7d8d503c4d69e53ae26fc
author Pavel Chupin <pavel.v.chupin@intel.com> Fri Sep 20 18:46:42 2013 +0400
committer Elliott Hughes <enh@google.com> Thu Oct 03 17:31:50 2013 -0700
tree 46580702630f0cda815f53916360a0ef09928127
parent 141029327cdc62629e248b3be1d7a58d4e9e5ba8

x86_64: Fix get_tls and statvfs

* bionic_tls.h - Add x86_64 version of get_tls macro;
* statvfs.h - 64-bit kernels don't have __statfs64/__fstatfs64, applying
workaround;

Change-Id: I20d7ddad74c7b7243866373d0142da6627c08280
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>

libc/private/bionic_tls.h

diff --git a/libc/private/bionic_tls.h b/libc/private/bionic_tls.h
index 9ea3647..f7a9051 100644
--- a/libc/private/bionic_tls.h
+++ b/libc/private/bionic_tls.h
@@ -106,6 +106,12 @@
     ({ register void* __val; \
        asm ("movl %%gs:0, %0" : "=r"(__val)); \
        (volatile void*) __val; })
+
+#elif defined(__x86_64__)
+# define __get_tls() \
+    ({ register void* __val; \
+       asm ("mov %%fs:0, %0" : "=r"(__val)); \
+       (volatile void*) __val; })
 #else
 #error unsupported architecture
 #endif