roll clang 138187:138188

tools/clang/scripts/update.sh

 #!/bin/bash
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This script will check out llvm and clang into third_party/llvm and build it.
 
 THIS_DIR="$(dirname "${0}")"
 LLVM_DIR="${THIS_DIR}/../../../third_party/llvm"
 LLVM_BUILD_DIR="${LLVM_DIR}/../llvm-build"
@@ skipping 16 matching lines @@
 if [ -f "${STAMP_FILE}" ]; then
   PREVIOUSLY_BUILT_REVISON=$(cat "${STAMP_FILE}")
   if [ "${PREVIOUSLY_BUILT_REVISON}" = "${CLANG_REVISION}" ]; then
     echo "Clang already at ${CLANG_REVISION}"
     exit 0
   fi
 fi
 # To always force a new build if someone interrupts their build half way.
 rm -f "${STAMP_FILE}"
 
+# Check if there's a prebuilt binary and if so just fetch that. That's faster,
+# and goma relies on having matching binary hashes on client and server too.
+CDS_URL=http://commondatastorage.googleapis.com/chromium-browser-clang

[Mark Mentovai, 2011/08/26 16:55:19]

Can you skip the “try to download binary” step if a special environment variable
is set? Maybe stick this entire block inside

if [[ -z "${CLANG_FORCE_BUILD_FROM_SOURCE}" ]]; then

[Nico, 2011/08/27 05:25:33]

I wanted to add some flag for that, and I'm waiting on
http://codereview.chromium.org/7741026/ to land so that I can build on the flag
processing code in their.

+CDS_FILE="clang-${CLANG_REVISION}.tgz"
+echo Trying to download prebuilt clang

[Mark Mentovai, 2011/08/26 16:55:19]

It’s good practice to quote the entire string you’re passing to echo. Also in
cases like the ones you have on lines 51 and 55, you can put the quotes around
the entire string you want to print, not just around ${CLANG_REVISION}.

[Nico, 2011/08/27 05:25:33]

Done.

+if [ "$(uname -s)" = "Linux" ]; then

[Mark Mentovai, 2011/08/26 16:55:19]

You run |uname -s| repeatedly to check the same thing. Just run it once and save
the result in a variable.

[Nico, 2011/08/27 05:25:33]

It's cheap to run and its result is unlikely to change.

+  wget "${CDS_URL}/Linux_x64/${CDS_FILE}" || rm -f "${CDS_FILE}"
+elif [ "$(uname -s)" = "Darwin" ]; then
+  curl -L --fail -O "${CDS_URL}/Mac/${CDS_FILE}" || rm -f "${CDS_FILE}"
+fi
+if [ -f "${CDS_FILE}" ]; then
+  rm -rf "${LLVM_BUILD_DIR}/Release+Asserts"
+  mkdir -p "${LLVM_BUILD_DIR}/Release+Asserts"
+  tar -xzf "${CDS_FILE}" -C "${LLVM_BUILD_DIR}/Release+Asserts"
+  echo clang "${CLANG_REVISION}" unpacked
+  echo "${CLANG_REVISION}" > "${STAMP_FILE}"
+  exit 0
+else
+  echo Did not find prebuilt clang at r"${CLANG_REVISION}", building
+fi
+
 if grep -q 'src/third_party/llvm":' "${DEPS_FILE}"; then
   echo LLVM pulled in through DEPS, skipping LLVM update step
 else
   echo Getting LLVM r"${CLANG_REVISION}" in "${LLVM_DIR}"
-  svn co --force "${LLVM_REPO_URL}/llvm/trunk@${CLANG_REVISION}" "${LLVM_DIR}"
+  if ! svn co --force "${LLVM_REPO_URL}/llvm/trunk@${CLANG_REVISION}" \
+                      "${LLVM_DIR}"; then
+    echo Checkout failed, retrying

[Mark Mentovai, 2011/08/26 16:55:19]

Why do you retry this one but not the one to check out tools/clang?

[Nico, 2011/08/27 05:25:33]

clang's checked out to llvm/tools/clang. It's very unlikely that one checkout is
from the internal mirror and the other isn't (since llvm is checked out first,
and since LLVM_REPO_URL doesn't change during the execution of this script, it
can only happen if someone mucks around manually on the bots)

+    rm -rf "${LLVM_DIR}"
+    svn co --force "${LLVM_REPO_URL}/llvm/trunk@${CLANG_REVISION}" "${LLVM_DIR}"
+  fi
 fi
 
 if grep -q 'src/third_party/llvm/tools/clang":' "${DEPS_FILE}"; then
   echo clang pulled in through DEPS, skipping clang update step
 else
   echo Getting clang r"${CLANG_REVISION}" in "${CLANG_DIR}"
   svn co --force "${LLVM_REPO_URL}/cfe/trunk@${CLANG_REVISION}" "${CLANG_DIR}"
 fi
 
 # Echo all commands.
 set -x
 
 # Build clang (in a separate directory).
 # The clang bots have this path hardcoded in built/scripts/slave/compile.py,
 # so if you change it you also need to change these links.
 mkdir -p "${LLVM_BUILD_DIR}"
 cd "${LLVM_BUILD_DIR}"
 if [ ! -f ./config.status ]; then
   ../llvm/configure \
       --enable-optimized \
+      --disable-threads \

[Mark Mentovai, 2011/08/26 16:55:19]

Curious about what GOMA’s requirements are that make this necessary.

Also curious about what impact this has on the built-up compiler.

[Nico, 2011/08/27 05:25:33]

They run gcc in a fake chrooted sandbox, and I'm guessing that sandbox doesn't
permit threads.
Me too! If I read the source correctly, the only effect of this is to replace
all methods on llvm's Mutex class with no-ops. This class isn't used at all in
tools/clang, and is only used in the JIT part of llvm (I think). I don't think
clang uses multiple threads when compiling.

I relanded this CL with a clang revision increment of 1, so if ld crashes again
on the waterfall, it's pretty likely it's caused by this configure change. So
far, everything looks good though.

+      --disable-pthreads \
       --without-llvmgcc \
       --without-llvmgxx
 fi
 
 NUM_JOBS=3
 if [ "$(uname -s)" = "Linux" ]; then
   NUM_JOBS="$(grep -c "^processor" /proc/cpuinfo)"
 elif [ "$(uname -s)" = "Darwin" ]; then
   NUM_JOBS="$(sysctl -n hw.ncpu)"
 fi
 make -j"${NUM_JOBS}"
 cd -
 
 # Build plugin.
 # Copy it into the clang tree and use clang's build system to compile the
 # plugin.
 PLUGIN_SRC_DIR="${THIS_DIR}/../plugins"
 PLUGIN_DST_DIR="${LLVM_DIR}/tools/clang/tools/chrome-plugin"
 PLUGIN_BUILD_DIR="${LLVM_BUILD_DIR}/tools/clang/tools/chrome-plugin"
 rm -rf "${PLUGIN_DST_DIR}"
 cp -R "${PLUGIN_SRC_DIR}" "${PLUGIN_DST_DIR}"
 rm -rf "${PLUGIN_BUILD_DIR}"
 mkdir -p "${PLUGIN_BUILD_DIR}"
 cp "${PLUGIN_SRC_DIR}/Makefile" "${PLUGIN_BUILD_DIR}"
 make -j"${NUM_JOBS}" -C "${PLUGIN_BUILD_DIR}"
 
 # After everything is done, log success for this revision.
 echo "${CLANG_REVISION}" > "${STAMP_FILE}"