VIXL Release 1.6

Refer to the README.md and LICENCE files for details.

3 files changed, 10 insertions, 4 deletions

diff --git a/tools/make_instruction_doc.pl b/tools/make_instruction_doc.pl
index 5457c38e..e1fa37e4 100755
--- a/tools/make_instruction_doc.pl
+++ b/tools/make_instruction_doc.pl
@@ -30,7 +30,7 @@
 my $hfile = "src/a64/assembler-a64.h";
 
 # Extra pseudo instructions added to AArch64.
-my @extras = qw/bind debug dci dc32 dc64/;
+my @extras = qw/bind debug dci dc32 dc64 place/;
 
 my %inst = ();  # Global hash of instructions.
 
diff --git a/tools/presubmit.py b/tools/presubmit.py
index cb84ac25..f0cc2baf 100755
--- a/tools/presubmit.py
+++ b/tools/presubmit.py
@@ -61,8 +61,7 @@ def BuildOptions():
   sim_default = 'off' if platform.machine() == 'aarch64' else 'on'
   result.add_argument('--simulator', action='store', choices=['on', 'off'],
                       default=sim_default,
-                      help='''Explicitly enable or disable the simulator. On
-                      this system, the default is "''' + sim_default + '".')
+                      help='Explicitly enable or disable the simulator.')
   return result.parse_args()
 
 
@@ -135,7 +134,9 @@ class Cctest(Test):
       name += ' (%s)' % ('debugger' if debugger else 'simulator')
     Test.__init__(self, name)
 
-    self.cctest = './cctest_sim'
+    self.cctest = './cctest'
+    if simulator:
+        self.cctest += '_sim'
     if mode == 'debug':
       self.cctest += '_g'
 
diff --git a/tools/test.py b/tools/test.py
index e79ceddc..4344a9d7 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -30,6 +30,7 @@ import os
 import sys
 import argparse
 import re
+import platform
 import subprocess
 import multiprocessing
 import time
@@ -66,6 +67,10 @@ def BuildOptions():
                       help='''Runs the tests using N jobs. If the option is set
                       but no value is provided, the script will use as many jobs
                       as it thinks useful.''')
+  sim_default = 'off' if platform.machine() == 'aarch64' else 'on'
+  result.add_argument('--simulator', action='store', choices=['on', 'off'],
+                      default=sim_default,
+                      help='Explicitly enable or disable the simulator.')
   return result.parse_args()