am 22678c4d: am dd384c3e: am a6e9ae80: Merge "Fix MIPS build."

* commit '22678c4db9cb6e72f1b8ae3e0896cb0a98bb26e9':
  Fix MIPS build.
This commit is contained in:
Elliott Hughes 2013-10-06 22:39:08 -07:00 committed by Android Git Automerger
commit b2018b5025

View File

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