Merge "Print runtime isa when invoking 'dalvikvm --showversion'"

1 files changed, 4 insertions, 1 deletions

diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc
index 0784e599b5..8ffd8bbc90 100644
--- a/runtime/parsed_options.cc
+++ b/runtime/parsed_options.cc
@@ -476,7 +476,10 @@ bool ParsedOptions::DoParse(const RuntimeOptions& options,
     Usage(nullptr);
     return false;
   } else if (args.Exists(M::ShowVersion)) {
-    UsageMessage(stdout, "ART version %s\n", Runtime::GetVersion());
+    UsageMessage(stdout,
+                 "ART version %s %s\n",
+                 Runtime::GetVersion(),
+                 GetInstructionSetString(kRuntimeISA));
     Exit(0);
   } else if (args.Exists(M::BootClassPath)) {
     LOG(INFO) << "setting boot class path to " << *args.Get(M::BootClassPath);