Merge pull request #11 from unicornx/dev-chrome-build

accumulated PR 2

Makefile

@@ -7,15 +7,21 @@
 # chrome_public_apk
 clean:
 	@echo Start cleaning target: "$(T)"
-	autoninja -v -C out/riscv64 -t clean $(T)
+	autoninja -C out/riscv64 -t clean $(T)
 	@echo Done!
 
-# make ninja T=<xxx>
 # build target and create log file
+# make ninja T=<xxx>
+# To get more verbose log:
+# make ninja T=<xxx> V=1
 ninja:
 	@echo Start building target: "$(T)"
 	-cp ./log ./log.bak
+ifeq ($(V),1)
 	autoninja -v -C out/riscv64 $(T) 2>&1 | tee ./log
+else
+	autoninja -C out/riscv64 $(T) 2>&1 | tee ./log
+endif
 	@echo Done!
 
 distclean:

build/config/compiler/BUILD.gn

@@ -438,6 +438,10 @@ config("compiler") {
     cflags += [ "-fPIC" ]
     ldflags += [ "-fPIC" ]
 
+    if (is_android && (target_cpu == "riscv64")) {
+      cflags += [ "-fno-emulated-tls" ]
+    }
+
     if (!is_clang) {
       # Use pipes for communicating between sub-processes. Faster.
       # (This flag doesn't do anything with Clang.)

buildtools/third_party/libc++abi/BUILD.gn

@@ -65,10 +65,6 @@ source_set("libc++abi") {
     "_LIBCPP_CONSTINIT=constinit",
   ]
 
-  if (is_android && target_cpu == "riscv64") {
-    defines += ["HAVE___CXA_THREAD_ATEXIT_IMPL"]
-  }
-
   configs -= [
     "//build/config/compiler:chromium_code",
     "//build/config/compiler:no_exceptions",