Update gdbclient for x86 target
Check the Target Architecture to choose the correct version of the gdb client. Change-Id: I1d75df235a18e60c6a7142a95c93b0fce69ee736 Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
This commit is contained in:
@@ -115,7 +115,12 @@ function setpaths()
|
|||||||
|
|
||||||
# The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it.
|
# The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it.
|
||||||
export ANDROID_EABI_TOOLCHAIN=
|
export ANDROID_EABI_TOOLCHAIN=
|
||||||
toolchaindir=toolchain/arm-linux-androideabi-4.4.x/bin
|
case $(get_build_var TARGET_ARCH) in
|
||||||
|
x86) toolchaindir=toolchain/i686-android-linux-4.4.3/bin
|
||||||
|
;;
|
||||||
|
arm|*) toolchaindir=toolchain/arm-linux-androideabi-4.4.x/bin
|
||||||
|
;;
|
||||||
|
esac
|
||||||
if [ -d "$prebuiltdir/$toolchaindir" ]; then
|
if [ -d "$prebuiltdir/$toolchaindir" ]; then
|
||||||
export ANDROID_EABI_TOOLCHAIN=$prebuiltdir/$toolchaindir
|
export ANDROID_EABI_TOOLCHAIN=$prebuiltdir/$toolchaindir
|
||||||
fi
|
fi
|
||||||
@@ -744,7 +749,7 @@ function gdbclient()
|
|||||||
echo >>"$OUT_ROOT/gdbclient.cmds" "target remote $PORT"
|
echo >>"$OUT_ROOT/gdbclient.cmds" "target remote $PORT"
|
||||||
echo >>"$OUT_ROOT/gdbclient.cmds" ""
|
echo >>"$OUT_ROOT/gdbclient.cmds" ""
|
||||||
|
|
||||||
arm-linux-androideabi-gdb -x "$OUT_ROOT/gdbclient.cmds" "$OUT_EXE_SYMBOLS/$EXE"
|
$ANDROID_EABI_TOOLCHAIN/*-gdb -x "$OUT_ROOT/gdbclient.cmds" "$OUT_EXE_SYMBOLS/$EXE"
|
||||||
else
|
else
|
||||||
echo "Unable to determine build system output dir."
|
echo "Unable to determine build system output dir."
|
||||||
fi
|
fi
|
||||||
|
Reference in New Issue
Block a user