commit c94cb65f21dcd0a84de98094d501b35c755af217
author Elliott Hughes <enh@google.com> Thu Mar 09 00:36:31 2023 +0000
committer Elliott Hughes <enh@google.com> Thu Mar 09 00:36:31 2023 +0000
tree f6249a2a9e3ed19c60995cbee5062c9f1fff6ed9
parent b3e82ffca0025eea96d09ab48e43d024fcc25564

Remove mips.

We aren't going to support riscv32, so we won't even need to reuse any
of this.

Test: treehugger
Change-Id: I80d6285ecbd0dfdeeb496be39ba63e06cbb30acd

scripts/symbol.py

diff --git a/scripts/symbol.py b/scripts/symbol.py
index 0a255e8..714c212 100755
--- a/scripts/symbol.py
+++ b/scripts/symbol.py
@@ -522,7 +522,7 @@
   if not toolchain:
     return None
 
-  toolchain_match = re.search("\/(aarch64|arm|mips|x86)\/", toolchain)
+  toolchain_match = re.search("\/(aarch64|arm|x86)\/", toolchain)
   if toolchain_match:
     abi = toolchain_match.group(1)
     if abi == "aarch64":
@@ -530,8 +530,6 @@
     elif bits == 64:
       if abi == "x86":
         return "x86_64"
-      elif abi == "mips":
-        return "mips64"
     return abi
   return None
 
@@ -600,7 +598,6 @@
   def test_toolchains_found(self):
     self.assert_toolchain_found("arm")
     self.assert_toolchain_found("arm64")
-    self.assert_toolchain_found("mips")
     self.assert_toolchain_found("x86")
     self.assert_toolchain_found("x86_64")
 
@@ -618,11 +615,6 @@
     SetAbi(["ABI: 'arm64'"])
     self.assertEqual(ARCH, "arm64")
 
-    SetAbi(["ABI: 'mips'"])
-    self.assertEqual(ARCH, "mips")
-    SetAbi(["ABI: 'mips64'"])
-    self.assertEqual(ARCH, "mips64")
-
     SetAbi(["ABI: 'x86'"])
     self.assertEqual(ARCH, "x86")
     SetAbi(["ABI: 'x86_64'"])
@@ -637,11 +629,6 @@
     self.assertEqual(ARCH, "arm")
 
     os.environ.clear()
-    os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/mips/arm-linux-androideabi-4.9/bin"
-    SetAbi(["#00 pc 000374e0"])
-    self.assertEqual(ARCH, "mips")
-
-    os.environ.clear()
     os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/x86/arm-linux-androideabi-4.9/bin"
     SetAbi(["#00 pc 000374e0"])
     self.assertEqual(ARCH, "x86")
@@ -656,12 +643,6 @@
     self.assertEqual(ARCH, "arm")
 
     os.environ.clear()
-    os.environ["ANDROID_TOOLCHAIN_2ND_ARCH"] = "linux-x86/mips/mips-linux-androideabi-4.9/bin"
-    os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/unknown/unknown-linux-androideabi-4.9/bin"
-    SetAbi(["#00 pc 000374e0"])
-    self.assertEqual(ARCH, "mips")
-
-    os.environ.clear()
     os.environ["ANDROID_TOOLCHAIN_2ND_ARCH"] = "linux-x86/x86/x86-linux-androideabi-4.9/bin"
     os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/unknown/unknown-linux-androideabi-4.9/bin"
     SetAbi(["#00 pc 000374e0"])
@@ -676,11 +657,6 @@
     self.assertEqual(ARCH, "arm64")
 
     os.environ.clear()
-    os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/mips/arm-linux-androideabi-4.9/bin"
-    SetAbi(["#00 pc 00000000000374e0"])
-    self.assertEqual(ARCH, "mips64")
-
-    os.environ.clear()
     os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/x86/arm-linux-androideabi-4.9/bin"
     SetAbi(["#00 pc 00000000000374e0"])
     self.assertEqual(ARCH, "x86_64")
@@ -703,11 +679,6 @@
     self.assertEqual(ARCH, "arm")
 
     os.environ.clear()
-    os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/mips/arm-linux-androideabi-4.9/bin"
-    SetAbi(["#10 0xb5eeba5d  (/system/vendor/lib/egl/libGLESv1_CM_adreno.so+0xfa5d)"])
-    self.assertEqual(ARCH, "mips")
-
-    os.environ.clear()
     os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/x86/arm-linux-androideabi-4.9/bin"
     SetAbi(["#10 0xb5eeba5d  (/system/vendor/lib/egl/libGLESv1_CM_adreno.so+0xfa5d)"])
     self.assertEqual(ARCH, "x86")
@@ -722,12 +693,6 @@
     self.assertEqual(ARCH, "arm")
 
     os.environ.clear()
-    os.environ["ANDROID_TOOLCHAIN_2ND_ARCH"] = "linux-x86/mips/mips-linux-androideabi-4.9/bin"
-    os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/unknown/unknown-linux-androideabi-4.9/bin"
-    SetAbi(["#3 0xae1725b5  (/system/vendor/lib/libllvm-glnext.so+0x6435b5)"])
-    self.assertEqual(ARCH, "mips")
-
-    os.environ.clear()
     os.environ["ANDROID_TOOLCHAIN_2ND_ARCH"] = "linux-x86/x86/x86-linux-androideabi-4.9/bin"
     os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/unknown/unknown-linux-androideabi-4.9/bin"
     SetAbi(["#3 0xae1725b5  (/system/vendor/lib/libllvm-glnext.so+0x6435b5)"])
@@ -742,11 +707,6 @@
     self.assertEqual(ARCH, "arm64")
 
     os.environ.clear()
-    os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/mips/arm-linux-androideabi-4.9/bin"
-    SetAbi(["#1 0x11b35d33bf  (/system/lib/libclang_rt.asan-arm-android.so+0x823bf)"])
-    self.assertEqual(ARCH, "mips64")
-
-    os.environ.clear()
     os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/x86/arm-linux-androideabi-4.9/bin"
     SetAbi(["#12 0x11b35d33bf  (/system/lib/libclang_rt.asan-arm-android.so+0x823bf)"])
     self.assertEqual(ARCH, "x86_64")