Roll clang 346388-1:346388-3

This picks up package.py changes #607265 and #608413. It does not change
the version of clang.

It also includes a crazy workaround for msys binaries (in our case
find.exe and mv.exe, used by lit tests) crashing during some unknown
chrome infra problem (see last bug).

Bug: 870331, 905289
Change-Id: Ic1d9fa64d6fcd4b590139c9343bed5bbe4d3faa3
Reviewed-on: https://chromium-review.googlesource.com/c/1337614
Commit-Queue: Hans Wennborg <hans@chromium.org>
Reviewed-by: Max Moroz <mmoroz@chromium.org>
Reviewed-by: Reid Kleckner <rnk@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608776}

tools/clang/scripts/package.py

@@ -281,6 +281,10 @@ def main():
         'lib/clang/*/lib/linux/libclang_rt.asan_cxx-x86_64.a',
         'lib/clang/*/lib/linux/libclang_rt.asan_cxx-x86_64.a.syms',
 
+        # AddressSanitizer Android runtime.
+        'lib/clang/*/lib/linux/libclang_rt.asan-aarch64-android.so',
+        'lib/clang/*/lib/linux/libclang_rt.asan-arm-android.so',
+
         # Fuzzing instrumentation (-fsanitize=fuzzer-no-link).
         'lib/clang/*/lib/linux/libclang_rt.fuzzer_no_main-x86_64.a',
 
@@ -295,6 +299,8 @@ def main():
         # Profile runtime (used by profiler and code coverage).
         'lib/clang/*/lib/linux/libclang_rt.profile-i386.a',
         'lib/clang/*/lib/linux/libclang_rt.profile-x86_64.a',
+        'lib/clang/*/lib/linux/libclang_rt.profile-aarch64-android.a',
+        'lib/clang/*/lib/linux/libclang_rt.profile-arm-android.a',
 
         # ThreadSanitizer C runtime (pure C won't link with *_cxx).
         'lib/clang/*/lib/linux/libclang_rt.tsan-x86_64.a',

tools/clang/scripts/update.py

@@ -35,7 +35,7 @@ if use_head_revision:
   CLANG_REVISION = 'HEAD'
 
 # This is incremented when pushing a new build of Clang at the same revision.
-CLANG_SUB_REVISION=1
+CLANG_SUB_REVISION=3
 
 PACKAGE_VERSION = "%s-%s" % (CLANG_REVISION, CLANG_SUB_REVISION)
 
@@ -358,6 +358,17 @@ def AddGnuWinToPath():
 
   os.environ['PATH'] = gnuwin_dir + os.pathsep + os.environ.get('PATH', '')
 
+  # find.exe, mv.exe and rm.exe are from MSYS (see crrev.com/389632). MSYS uses
+  # Cygwin under the hood, and initializing Cygwin has a race-condition when
+  # getting group and user data from the Active Directory is slow. To work
+  # around this, use a horrible hack telling it not to do that.
+  # See https://crbug.com/905289
+  etc = os.path.join(gnuwin_dir, '..', '..', 'etc')
+  EnsureDirExists(etc)
+  with open(os.path.join(etc, 'nsswitch.conf'), 'w') as f:
+    f.write('passwd: files\n')
+    f.write('group: files\n')
+
 
 win_sdk_dir = None
 dia_dll = None