Fix the stack/ tool for 64 bit archs.

pc values might now be 16 bytes wide. Also add support
for the arm64 architecture switch.

Change-Id: Ia2e0282f3bee03ef6092de285b0c32fa6da07cb0
This commit is contained in:
Narayan Kamath
2014-04-12 12:16:02 +01:00
parent 2d2e407f1f
commit 9649700787
2 changed files with 20 additions and 4 deletions

View File

@@ -79,7 +79,12 @@ def FindToolchain():
return TOOLCHAIN_INFO
## Known toolchains, newer ones in the front.
if ARCH == "arm":
if ARCH == "arm64":
gcc_version = os.environ["TARGET_GCC_VERSION"]
known_toolchains = [
("aarch64-linux-android-" + gcc_version, "aarch64", "aarch64-linux-android")
]
elif ARCH == "arm":
gcc_version = os.environ["TARGET_GCC_VERSION"]
known_toolchains = [
("arm-linux-androideabi-" + gcc_version, "arm", "arm-linux-androideabi"),
@@ -96,6 +101,7 @@ def FindToolchain():
toolchain_info = (label, platform, target);
if os.path.exists(ToolPath("addr2line", toolchain_info)):
TOOLCHAIN_INFO = toolchain_info
print "Using toolchain from :" + ToolPath("", TOOLCHAIN_INFO)
return toolchain_info
raise Exception("Could not find tool chain")