commit 247f07b22db06dd77691ba6ab4c8135619cd1b48
author Ian Rogers <irogers@google.com> Thu May 01 16:04:47 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 01 16:04:47 2014 +0000
tree 2a6e648ad5b5cde1efcdb1e3e5eb801bfff2f45e
parent 1855933972ac3a57da5b780151e4b256f18d95b3
parent e4e5d8caab4869eaec8995e8e64e4fa7af914845

Merge "Define kInstructionSet for x86-64 and arm64."

libdex/OptInvocation.cpp

diff --git a/libdex/OptInvocation.cpp b/libdex/OptInvocation.cpp
index e7b3fdd..efee2e6 100644
--- a/libdex/OptInvocation.cpp
+++ b/libdex/OptInvocation.cpp
@@ -35,12 +35,16 @@
 static const char* kCacheDirectoryName = "dalvik-cache";
 static const char* kClassesDex = "classes.dex";
 
-#if defined(__arm__)
-static const char kInstructionSet[] = "arm";
+#if defined(__aarch64__)
+static const char* kInstructionSet = "arm64";
+#elif defined(__arm__)
+static const char* kInstructionSet = "arm";
 #elif defined(__i386__)
-static const char kInstructionSet[] = "x86";
+static const char* kInstructionSet = "x86";
 #elif defined(__mips__)
-static const char kInstructionSet[] = "mips";
+static const char* kInstructionSet = "mips";
+#elif defined(__x86_64__)
+static const char* kInstructionSet = "x86_64";
 #else
 #error Unsupported instruction set.
 #endif