commit 42b9872460919c70f3b8be1b829f18aeb0909d2d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Mar 07 05:36:28 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Mar 07 05:36:28 2020 +0000
tree de7fd6eb79937d920519959c4f17600820a07645
parent 279b6f9c5e6b5fade1ecb2c50b4c773a29fe384c
parent 84478afc3a3d4ef85818343a2dd153b29cad8e37

Remove mips workarounds. am: 595f4a2c04 am: 84478afc3a

Change-Id: Ib354c4322ebae3f3ea23348b304363369ccb787d

Android.bp

diff --git a/Android.bp b/Android.bp
index d112d6b..b63a44b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -55,18 +55,6 @@
                 "include/tdep-aarch64",
             ],
         },
-        mips: {
-            local_include_dirs: [
-                "include",
-                "include/tdep-mips",
-            ],
-        },
-        mips64: {
-            local_include_dirs: [
-                "include",
-                "include/tdep-mips",
-            ],
-        },
         x86: {
             local_include_dirs: [
                 "include",
@@ -257,70 +245,6 @@
                 "src/aarch64/Lis_signal_frame.c",
             ],
         },
-        mips: {
-            srcs: [
-                "src/mips/is_fpreg.c",
-                "src/mips/regname.c",
-                "src/mips/Gcreate_addr_space.c",
-                "src/mips/Gget_proc_info.c",
-                "src/mips/Gget_save_loc.c",
-                "src/mips/Gglobal.c",
-                "src/mips/Ginit.c",
-                "src/mips/Ginit_local.c",
-                "src/mips/Ginit_remote.c",
-                "src/mips/Gregs.c",
-                "src/mips/Gresume.c",
-                "src/mips/Gstep.c",
-                "src/mips/Lcreate_addr_space.c",
-                "src/mips/Lget_proc_info.c",
-                "src/mips/Lget_save_loc.c",
-                "src/mips/Lglobal.c",
-                "src/mips/Linit.c",
-                "src/mips/Linit_local.c",
-                "src/mips/Linit_remote.c",
-                "src/mips/Lregs.c",
-                "src/mips/Lresume.c",
-                "src/mips/Lstep.c",
-
-                "src/mips/getcontext-android.S",
-                "src/mips/Gis_signal_frame.c",
-                "src/mips/Lis_signal_frame.c",
-            ],
-        },
-        // mips and mips64 use the same sources but define _MIP_SIM differently
-        // to change the behavior.
-        //   mips uses o32 abi (_MIPS_SIM == _ABIO32).
-        //   mips64 uses n64 abi (_MIPS_SIM == _ABI64).
-        mips64: {
-            srcs: [
-                "src/mips/is_fpreg.c",
-                "src/mips/regname.c",
-                "src/mips/Gcreate_addr_space.c",
-                "src/mips/Gget_proc_info.c",
-                "src/mips/Gget_save_loc.c",
-                "src/mips/Gglobal.c",
-                "src/mips/Ginit.c",
-                "src/mips/Ginit_local.c",
-                "src/mips/Ginit_remote.c",
-                "src/mips/Gregs.c",
-                "src/mips/Gresume.c",
-                "src/mips/Gstep.c",
-                "src/mips/Lcreate_addr_space.c",
-                "src/mips/Lget_proc_info.c",
-                "src/mips/Lget_save_loc.c",
-                "src/mips/Lglobal.c",
-                "src/mips/Linit.c",
-                "src/mips/Linit_local.c",
-                "src/mips/Linit_remote.c",
-                "src/mips/Lregs.c",
-                "src/mips/Lresume.c",
-                "src/mips/Lstep.c",
-
-                "src/mips/getcontext-android.S",
-                "src/mips/Gis_signal_frame.c",
-                "src/mips/Lis_signal_frame.c",
-            ],
-        },
         x86: {
             srcs: [
                 "src/x86/is_fpreg.c",