From 876b092025b1ba71269ab13050843166724abc00 Mon Sep 17 00:00:00 2001
From: Andreas Gampe <agampe@google.com>
Date: Mon, 1 Jun 2015 15:53:45 -0700
Subject: [PATCH] Development: change gdbclient GDB selection

Mips now uses the 64-bit version in general. Also simplify the x86
selection.

Bug: 21467410
Bug: 21555893
Change-Id: If0477356d3c3dbf9e0dfbfcabcb098dc7b8aeba2
---
 scripts/gdbclient | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/scripts/gdbclient b/scripts/gdbclient
index b74a8f01e..2a846389a 100755
--- a/scripts/gdbclient
+++ b/scripts/gdbclient
@@ -136,17 +136,12 @@ function gdbclient() {
   if [[ $CPU_ABI =~ (^|,)arm64 ]]; then
     GDB=arm-linux-androideabi-gdb
     GDB64=aarch64-linux-android-gdb
-  elif [[ $CPU_ABI =~ (^|,)x86_64 ]]; then
+  elif [[ $CPU_ABI =~ (^|,)x86 ]]; then    # x86 (32-bit and 64-bit) is unified.
     GDB=x86_64-linux-android-gdb
-  elif [[ $CPU_ABI =~ (^|,)mips64 ]]; then
-    GDB=mipsel-linux-android-gdb
-    GDB64=mips64el-linux-android-gdb
-  elif [[ $CPU_ABI =~ (^|,)x86 ]]; then    # See note above for order.
-    GDB=x86_64-linux-android-gdb
-  elif [[ $CPU_ABI =~ (^|,)arm ]]; then
+  elif [[ $CPU_ABI =~ (^|,)mips ]]; then   # Mips (32-bit and 64-bit) is unified.
+    GDB=mips64el-linux-android-gdb
+  elif [[ $CPU_ABI =~ (^|,)arm ]]; then    # See note above for order.
     GDB=arm-linux-androideabi-gdb
-  elif [[ $CPU_ABI =~ (^|,)mips ]]; then
-    GDB=mipsel-linux-android-gdb
   else
     echo "Error: unrecognized cpu.abilist: $CPU_ABI"
     return -6