[Android] RISCV64 Support Based on Clang 12

Signed-off-by: McKnight22 <tao.wang.22@outlook.com>
aosp-riscv · Dec 28, 2022 · 9a716ee · 9a716ee
1 parent caf2b42
commit 9a716ee
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 6 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -261,7 +261,7 @@ config("extra_warnings") {
       "-Wtautological-type-limit-compare",
       "-Wundefined-reinterpret-cast",
       "-Wunneeded-internal-declaration",
-      "-Wunused-but-set-variable",
+      # "-Wunused-but-set-variable",
       "-Wsuggest-destructor-override",
       "-Wsuggest-override",
 

diff --git a/gni/angle.gni b/gni/angle.gni
@@ -91,7 +91,7 @@ declare_args() {
 
   if (current_cpu == "arm64" || current_cpu == "x64" ||
       current_cpu == "mips64el" || current_cpu == "s390x" ||
-      current_cpu == "ppc64" || current_cpu == "loong64") {
+      current_cpu == "ppc64" || current_cpu == "loong64" || current_cpu == "riscv64") {
     angle_64bit_current_cpu = true
   } else if (current_cpu == "arm" || current_cpu == "x86" ||
              current_cpu == "mipsel" || current_cpu == "s390" ||

diff --git a/src/compiler/preprocessor/preprocessor_tab_autogen.cpp b/src/compiler/preprocessor/preprocessor_tab_autogen.cpp
@@ -93,7 +93,7 @@
 #endif
 #if defined(__clang__)
 #    pragma clang diagnostic ignored "-Wunreachable-code"
-#    pragma clang diagnostic ignored "-Wunused-but-set-variable"
+// #    pragma clang diagnostic ignored "-Wunused-but-set-variable"
 #endif
 
 #include "ExpressionParser.h"

diff --git a/src/compiler/translator/glslang_tab_autogen.cpp b/src/compiler/translator/glslang_tab_autogen.cpp
@@ -89,7 +89,7 @@
 #endif
 #if defined(__clang__)
 #    pragma clang diagnostic ignored "-Wunreachable-code"
-#    pragma clang diagnostic ignored "-Wunused-but-set-variable"
+// #    pragma clang diagnostic ignored "-Wunused-but-set-variable"
 #endif
 
 #include "GLSLANG/ShaderLang.h"

diff --git a/src/libGLESv2/global_state.h b/src/libGLESv2/global_state.h
@@ -81,6 +81,13 @@ constexpr size_t kAndroidOpenGLTlsSlot = 3;
                 __asm__("mov %%fs:0, %0" : "=r"(__val)); \
                 __val;                                   \
             })
+#    elif (defined(__riscv) && (__riscv_xlen == 64))
+#         define ANGLE_ANDROID_GET_GL_TLS()              \
+            ({                                           \
+                void** __val;                            \
+                 __asm__("mv %0, tp" : "=r"(__val));     \
+                 __val;                                  \
+            })
 #    else
 #        error unsupported architecture
 #    endif

diff --git a/src/third_party/libXNVCtrl/BUILD.gn b/src/third_party/libXNVCtrl/BUILD.gn
@@ -10,7 +10,7 @@ config("libXNVCtrl_config") {
   # XextAddDisplay which will cause a failure.
   cflags = [
     "-Wno-incompatible-pointer-types-discards-qualifiers",
-    "-Wno-deprecated-non-prototype",
+    #"-Wno-deprecated-non-prototype",
   ]
 }
 

diff --git a/third_party/astc-encoder/BUILD.gn b/third_party/astc-encoder/BUILD.gn
@@ -44,6 +44,6 @@ source_set("astcenc") {
   }
 
   if (is_clang) {
-    cflags_cc = [ "-Wno-unused-but-set-variable" ]
+    #cflags_cc = [ "-Wno-unused-but-set-variable" ]
   }
 }