am c656d732: Merge "Always use v1 for MIPS TLS access."

* commit 'c656d732c7712b0f73d9c560ccf3cb5ae47d219d':
  Always use v1 for MIPS TLS access.
This commit is contained in:
Elliott Hughes 2013-06-18 13:57:57 -07:00 committed by Android Git Automerger
commit 13e23302c9

View file

@ -89,7 +89,8 @@ extern int __set_tls(void* ptr);
(volatile void*) __val; })
#elif defined(__mips__)
# define __get_tls() \
({ register unsigned int __val; \
/* On mips32r1, this goes via a kernel illegal instruction trap that's optimized for v1. */ \
({ register unsigned int __val asm("v1"); \
asm (" .set push\n" \
" .set mips32r2\n" \
" rdhwr %0,$29\n" \