diff options
| author | Jing Yu <jingyu@google.com> | 2012-05-09 15:34:35 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-05-09 15:34:35 -0700 |
| commit | 4de44f205cff6f1f22b4043167117e705e8c741b (patch) | |
| tree | 7f37cecd147906550a4b0a3ef968409f4c9a5faa | |
| parent | 525adcedbdb51a57a31a4927bf6129df7e8efead (diff) | |
| parent | 61ff5937553203c553a467f4d7475f75ac086253 (diff) | |
| download | build-4de44f205cff6f1f22b4043167117e705e8c741b.tar.gz | |
Merge "Set correct GDB_TARGET for i[3456]86-*-linux-android and x86_64-*-linux-android"
| -rwxr-xr-x | configure | 14 | ||||
| -rw-r--r-- | configure.ac | 14 |
2 files changed, 24 insertions, 4 deletions
@@ -1990,7 +1990,8 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # 1. arm-linux-androideabi (primary target) # 2. arm-eabi (for Android kernel) # 3. arm-newlib-eabi (for gcc testing) -# 4.i[3456]86-*-linux-gnu, x86-*-linux-gnu (for x86 targets) +# 4. i[3456]86-*-linux-gnu, x86-*-linux-gnu, i[3456]86-*-linux-android, x86-*-linux-android (for x86 targets) +# 5. mips*-*-linux* (for mips targets) GDB_TARGET=$target case $target in @@ -2001,9 +2002,18 @@ case $target in arm-newlib-elf) BUILD_ANDROID_GCC=no ;; - i[3456]86-*-linux-gnu | x86_64-*-linux-gnu | i[3456]86-*-linux-android | x86_64-*-linux-android) + i[3456]86-*-linux-gnu | x86_64-*-linux-gnu) 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; esac diff --git a/configure.ac b/configure.ac index 6953909..d54f385 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,8 @@ AC_PROG_INSTALL # 1. arm-linux-androideabi (primary target) # 2. arm-eabi (for Android kernel) # 3. arm-newlib-eabi (for gcc testing) -# 4.i[3456]86-*-linux-gnu, x86-*-linux-gnu (for x86 targets) +# 4. i[3456]86-*-linux-gnu, x86-*-linux-gnu, i[3456]86-*-linux-android, x86-*-linux-android (for x86 targets) +# 5. mips*-*-linux* (for mips targets) GDB_TARGET=$target case $target in @@ -36,9 +37,18 @@ case $target in arm-newlib-elf) BUILD_ANDROID_GCC=no ;; - i[[3456]]86-*-linux-gnu | x86_64-*-linux-gnu | i[[3456]]86-*-linux-android | x86_64-*-linux-android) + i[[3456]]86-*-linux-gnu | x86_64-*-linux-gnu) 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.); esac |