generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "x86_64: Fix get_tls and statvfs"

Browse Source
This commit is contained in:
Elliott Hughes 2013-10-04 00:34:49 +00:00 committed by Gerrit Code Review
commit 41ba05e22e
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libc/bionic/statvfs.cpp
View File

@ -18,8 +18,15 @@
#include <sys/statfs.h>
extern "C" int __statfs64(const char*, size_t, struct statfs*);
// Paper over the fact that 32-bit kernels use fstatfs64/statfs64 with an extra argument,
// but 64-bit kernels don't have the "64" bit suffix or the extra size_t argument.
#if __LP64__
# define __fstatfs64(fd,size,buf) fstatfs(fd,buf)
# define __statfs64(path,size,buf) statfs(path,buf)
#else
extern "C" int __fstatfs64(int, size_t, struct statfs*);
extern "C" int __statfs64(const char*, size_t, struct statfs*);
#endif
#define ST_VALID 0x0020

6
libc/private/bionic_tls.h
View File

@ -106,6 +106,12 @@ extern int __set_tls(void* ptr);
({ 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