Merge "Always use v1 for MIPS TLS access."

2013-06-18 20:56:25 +00:00 · 2013-06-18 20:56:25 +00:00 · c656d732c7
commit c656d732c7
parent 0846109c96 a33dc57c7c
1 changed files with 2 additions and 1 deletions
--- a/libc/private/bionic_tls.h
+++ b/libc/private/bionic_tls.h
@ -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" \