diff options
| author | Duane Sand <duane.sand@imgtec.com> | 2015-02-02 16:54:15 -0800 |
|---|---|---|
| committer | Duane Sand <duane.sand@imgtec.com> | 2015-02-02 16:54:15 -0800 |
| commit | ecacc3f164f2bf2c8c4ff5a20496511249d2cd4b (patch) | |
| tree | dea6387aa7ab20358ed3bfbff85acc4756c7e6f5 | |
| parent | a46ff664571465b7a2741bed4225d30b5bf07503 (diff) | |
| download | frameworks_native-ecacc3f164f2bf2c8c4ff5a20496511249d2cd4b.zip frameworks_native-ecacc3f164f2bf2c8c4ff5a20496511249d2cd4b.tar.gz frameworks_native-ecacc3f164f2bf2c8c4ff5a20496511249d2cd4b.tar.bz2 | |
[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
| -rw-r--r-- | opengl/libs/EGL/getProcAddress.cpp | 1 | ||||
| -rw-r--r-- | opengl/libs/GLES2/gl2.cpp | 1 | ||||
| -rw-r--r-- | opengl/libs/GLES_CM/gl.cpp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/opengl/libs/EGL/getProcAddress.cpp b/opengl/libs/EGL/getProcAddress.cpp index 2b2b227..660af33 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 40555d7..d5dc012 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 0b30956..b1b31f8 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" \ |