Revert setting GDB_TARGET for i[3456]86-*-linux-android and x86_64-*-linux-android
Andrew Hsieh [Thu, 10 May 2012 18:05:49 +0000 (02:05 +0800)]
This CL reverts https://android-review.googlesource.com/#/c/36421
in favor of CL https://android-review.googlesource.com/#/c/36453
which patches GDB/config.sub directly to understand linux-android.

Please see comments in the first CL for rationale.

Change-Id: If3ed4f584d12bf2e998deaeb8b87c07250ed7e03

configure
configure.ac

index 1f9d614..98dc7b1 100755 (executable)
--- a/configure
+++ b/configure
@@ -2002,17 +2002,11 @@ case $target in
   arm-newlib-elf)
     BUILD_ANDROID_GCC=no
     ;;
-  i[3456]86-*-linux-gnu | x86_64-*-linux-gnu)
+  i[3456]86-*-linux-gnu | x86_64-*-linux-gnu | i[3456]86-*-linux-android | x86_64-*-linux-android)
     BUILD_ANDROID_GCC=yes
     ;;
-  i[3456]86-*-linux-android | x86_64-*-linux-android)
-    BUILD_ANDROID_GCC=yes
-    # Change target to *-linux-gnu because linux-android isn't supported until GDB 7.2
-    GDB_TARGET=${target%%-*}-linux-gnu
-    ;;
   mips*-*-linux*)
     BUILD_ANDROID_GCC=yes
-    GDB_TARGET=mipsel-linux-gnu
     ;;
   *)
     as_fn_error "Unsupported target $target." "$LINENO" 5;
index d54f385..ad947c7 100644 (file)
@@ -37,17 +37,11 @@ case $target in
   arm-newlib-elf)
     BUILD_ANDROID_GCC=no
     ;;
-  i[[3456]]86-*-linux-gnu | x86_64-*-linux-gnu)
+  i[[3456]]86-*-linux-gnu | x86_64-*-linux-gnu | i[[3456]]86-*-linux-android | x86_64-*-linux-android)
     BUILD_ANDROID_GCC=yes
     ;;
-  i[[3456]]86-*-linux-android | x86_64-*-linux-android)
-    BUILD_ANDROID_GCC=yes
-    # Change target to *-linux-gnu because linux-android isn't supported until GDB 7.2
-    GDB_TARGET=${target%%-*}-linux-gnu
-    ;;
   mips*-*-linux*)
     BUILD_ANDROID_GCC=yes
-    GDB_TARGET=mipsel-linux-gnu
     ;;
   *)
     AC_MSG_ERROR(Unsupported target $target.);