commit 54b43ff2d8e92841cb46f2162f4fa1489719ff27
author Treehugger Robot <treehugger-gerrit@google.com> Sat Mar 07 20:30:52 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 07 20:30:52 2020 +0000
tree fd807120e61129eee5f8cad56de54d8e46f2610e
parent f47b4a41cd0bd115eef480927ad7ef9656e8ed60
parent db3064b21460c89e838595ce05670f2834362386

Merge "Remove mips workarounds."

Android.bp

diff --git a/Android.bp b/Android.bp
index d8f5cff..8d12b3d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -43,12 +43,6 @@
     ],
 
     arch: {
-        mips: {
-            srcs: ["lib/builtins/clear_cache.c"],
-        },
-        mips64: {
-            srcs: ["lib/builtins/clear_cache.c"],
-        },
         // Clang generates call to __unorddf2 builtin when compiling s_fmal.c
         // in bionic.  Generate this builtin from compiler-rt for arm64 and
         // x86_64 (where the corresponding libgcc does not have this builtin.
@@ -310,11 +304,6 @@
                 "lib/builtins/umodsi3.c",
             ],
         },
-        mips64: {
-            cflags: [
-                "-DCRT_HAS_128BIT",
-            ],
-        },
         x86: {
             srcs: [
                 "lib/builtins/i386/ashldi3.S",
@@ -382,14 +371,6 @@
             static_libs: ["libunwindbacktrace", "libunwind_static"],
             ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a:libunwind.a"],
         },
-        android_mips: {
-            static_libs: ["libunwindbacktrace", "libunwind_static"],
-            ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a:libunwind.a"],
-        },
-        android_mips64: {
-            static_libs: ["libunwindbacktrace", "libunwind_static"],
-            ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a:libunwind.a"],
-        },
         android_x86: {
             static_libs: ["libunwindbacktrace", "libunwind_static"],
             ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a:libunwind.a"],