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

am 4e965d95: Merge "libc: Remove deprecated register"

Browse Source 
* commit '4e965d95cfe19cc7d3aefd9b8d0ad607475793fe':
  libc: Remove deprecated register
This commit is contained in:
Elliott Hughes 2013-10-06 21:45:58 -07:00 committed by Android Git Automerger
commit 06ac96d134
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libc/private/bionic_tls.h
View File

@ -89,13 +89,13 @@ extern int __set_tls(void* ptr);
/* get the TLS */ /* get the TLS */
#if defined(__arm__) #if defined(__arm__)
# define __get_tls() \ # define __get_tls() \
({ register unsigned int __val; \ ({ unsigned int __val; \
asm ("mrc p15, 0, %0, c13, c0, 3" : "=r"(__val)); \ asm ("mrc p15, 0, %0, c13, c0, 3" : "=r"(__val)); \
(volatile void*) __val; }) (volatile void*) __val; })
#elif defined(__mips__) #elif defined(__mips__)
# define __get_tls() \ # define __get_tls() \
/* On mips32r1, this goes via a kernel illegal instruction trap that's optimized for v1. */ \ /* On mips32r1, this goes via a kernel illegal instruction trap that's optimized for v1. */ \
({ register unsigned int __val asm("v1"); \ ({ unsigned int __val asm("v1"); \
asm (" .set push\n" \ asm (" .set push\n" \
" .set mips32r2\n" \ " .set mips32r2\n" \
" rdhwr %0,$29\n" \ " rdhwr %0,$29\n" \
@ -103,13 +103,13 @@ extern int __set_tls(void* ptr);
(volatile void*) __val; }) (volatile void*) __val; })
#elif defined(__i386__) #elif defined(__i386__)
# define __get_tls() \ # define __get_tls() \
({ register void* __val; \ ({ void* __val; \
asm ("movl %%gs:0, %0" : "=r"(__val)); \ asm ("movl %%gs:0, %0" : "=r"(__val)); \
(volatile void*) __val; }) (volatile void*) __val; })
#elif defined(__x86_64__) #elif defined(__x86_64__)
# define __get_tls() \ # define __get_tls() \
({ register void* __val; \ ({ void* __val; \
asm ("mov %%fs:0, %0" : "=r"(__val)); \ asm ("mov %%fs:0, %0" : "=r"(__val)); \
(volatile void*) __val; }) (volatile void*) __val; })
#else #else