aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-05-11 02:05:49 +0800
committerAndrew Hsieh <andrewhsieh@google.com>2012-05-11 08:00:26 +0800
commit777b41ba19cc104b6cefc3b4c408c1121ae95aaa (patch)
tree53e4e6c9eb701164d7f2ce30f44605fd093e23ba
parent4de44f205cff6f1f22b4043167117e705e8c741b (diff)
downloadbuild-777b41ba19cc104b6cefc3b4c408c1121ae95aaa.tar.gz
Revert setting GDB_TARGET for i[3456]86-*-linux-android and x86_64-*-linux-android
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
-rwxr-xr-xconfigure8
-rw-r--r--configure.ac8
2 files changed, 2 insertions, 14 deletions
diff --git a/configure b/configure
index 1f9d614..98dc7b1 100755
--- 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;
diff --git a/configure.ac b/configure.ac
index d54f385..ad947c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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.);