From: Duane Sand Date: Tue, 3 Feb 2015 00:54:15 +0000 (-0800) Subject: [MIPS] Fix mips32r1 build X-Git-Tag: android-x86-7.1-r1~1005^2~96^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ecacc3f164f2bf2c8c4ff5a20496511249d2cd4b;p=android-x86%2Fframeworks-native.git [MIPS] Fix mips32r1 build Fix regression from 6701fbe5f0d799c5245b0cdf3a69ecdcbfd9fb08 . The rdhwr instruction is unsupported by mips32r1 cpus, but is supported via kernel emulation on those cpus. Change-Id: Ieb3343fff0f0da54003044f451c90e1c761208eb --- diff --git a/opengl/libs/EGL/getProcAddress.cpp b/opengl/libs/EGL/getProcAddress.cpp index 2b2b2270e9..660af3347b 100644 --- a/opengl/libs/EGL/getProcAddress.cpp +++ b/opengl/libs/EGL/getProcAddress.cpp @@ -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" \ diff --git a/opengl/libs/GLES2/gl2.cpp b/opengl/libs/GLES2/gl2.cpp index 40555d735d..d5dc0128ea 100644 --- a/opengl/libs/GLES2/gl2.cpp +++ b/opengl/libs/GLES2/gl2.cpp @@ -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" \ diff --git a/opengl/libs/GLES_CM/gl.cpp b/opengl/libs/GLES_CM/gl.cpp index 0b309566cd..b1b31f8294 100644 --- a/opengl/libs/GLES_CM/gl.cpp +++ b/opengl/libs/GLES_CM/gl.cpp @@ -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" \