From 0bdeb5def7a506e6c63508c2c23c595cf4162568 Mon Sep 17 00:00:00 2001
From: dbeam <dbeam@chromium.org>
Date: Fri, 1 May 2015 10:50:19 -0700
Subject: Revert of Roll Clang 233105:234521 (patchset #3 id:40001 of
 https://codereview.chromium.org/1115633003/)

Reason for revert:
May have caused a __TEXT size change on mac clobber builders running sizes:
http://build.chromium.org/p/chromium/builders/Mac/builds/1588

This is a speculative revert because we're not totally sure this is the cause.  Promise to reinstate (re-revert) if nothing gets fixed.

Original issue's description:
> Roll Clang 233105:234521
>
> BUG=483026
>
> Committed: https://crrev.com/10a866ab06ab72fa161328cb922052876c49c3a8
> Cr-Commit-Position: refs/heads/master@{#327801}

TBR=thakis@chromium.org,hans@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=483026

Review URL: https://codereview.chromium.org/1118353002

Cr-Commit-Position: refs/heads/master@{#327933}
---
 tools/clang/scripts/update.sh | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'tools/clang')

diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh
index 78a21a4..f0dbeb0 100755
--- a/tools/clang/scripts/update.sh
+++ b/tools/clang/scripts/update.sh
@@ -8,10 +8,10 @@
 # Do NOT CHANGE this if you don't know what you're doing -- see
 # https://code.google.com/p/chromium/wiki/UpdatingClang
 # Reverting problematic clang rolls is safe, though.
-CLANG_REVISION=234521
+CLANG_REVISION=233105
 
 # This is incremented when pushing a new build of Clang at the same revision.
-CLANG_SUB_REVISION=1
+CLANG_SUB_REVISION=2
 
 PACKAGE_VERSION="${CLANG_REVISION}-${CLANG_SUB_REVISION}"
 
@@ -397,6 +397,27 @@ EOF
   patch -p0
   popd
 
+  # Cherry-pick r234010 [sancov] Shrink pc array on Android back to 2**24."
+  pushd "${COMPILER_RT_DIR}"
+  cat << 'EOF' |
+diff --git a/lib/sanitizer_common/sanitizer_coverage_libcdep.cc b/lib/sanitizer_common/sanitizer_coverage_libcdep.cc
+index 4b976fc..cfd9e7e 100644
+--- a/lib/sanitizer_common/sanitizer_coverage_libcdep.cc
++++ b/lib/sanitizer_common/sanitizer_coverage_libcdep.cc
+@@ -109,7 +109,8 @@ class CoverageData {
+ 
+   // Maximal size pc array may ever grow.
+   // We MmapNoReserve this space to ensure that the array is contiguous.
+-  static const uptr kPcArrayMaxSize = FIRST_32_SECOND_64(1 << 26, 1 << 27);
++  static const uptr kPcArrayMaxSize =
++      FIRST_32_SECOND_64(1 << (SANITIZER_ANDROID ? 24 : 26), 1 << 27);
+   // The amount file mapping for the pc array is grown by.
+   static const uptr kPcArrayMmapSize = 64 * 1024;
+
+EOF
+  patch -p1
+  popd
+
   # This Go bindings test doesn't work after the bootstrap build on Linux. (PR21552)
   pushd "${LLVM_DIR}"
   cat << 'EOF' |
-- 
cgit v1.1