am 5e44f932: am b6b81d6a: Merge "[MIPS] Fix mips32r1 build"

* commit '5e44f932a28ebecaefed942224efa0b0d4bf36c5':
  [MIPS] Fix mips32r1 build
This commit is contained in:
Jesse Hall 2015-03-15 22:34:00 +00:00 committed by Android Git Automerger
commit a5b1ac67e7
3 changed files with 3 additions and 0 deletions

View File

@ -163,6 +163,7 @@ namespace android {
asm volatile( \
".set push\n\t" \
".set noreorder\n\t" \
".set mips32r2\n\t" \
"rdhwr %[tls], $29\n\t" \
"lw %[t0], %[OPENGL_API](%[tls])\n\t" \
"beqz %[t0], 1f\n\t" \

View File

@ -163,6 +163,7 @@ using namespace android;
asm volatile( \
".set push\n\t" \
".set noreorder\n\t" \
".set mips32r2\n\t" \
"rdhwr %[tls], $29\n\t" \
"lw %[t0], %[OPENGL_API](%[tls])\n\t" \
"beqz %[t0], 1f\n\t" \

View File

@ -219,6 +219,7 @@ GL_API void GL_APIENTRY glWeightPointerOESBounds(GLint size, GLenum type,
asm volatile( \
".set push\n\t" \
".set noreorder\n\t" \
".set mips32r2\n\t" \
"rdhwr %[tls], $29\n\t" \
"lw %[t0], %[OPENGL_API](%[tls])\n\t" \
"beqz %[t0], 1f\n\t" \