Reviewers: Benedikt Meurer,

Message:
PTAL. Now the gold plugin will be downloaded automatically if cfi is specified.
The up-to-date check is pinned to clang's version.

A bit hacky - nicer would be if the gold plugin had its own stamp and version
file - or an md5 hash checked in to which it could be compared, to avoid
unnecessary downloads.

Description:
Automatically download gold plugin for cfi builds.

BUG=chromium:515782
LOG=n
NOTRY=true

Please review this at https://codereview.chromium.org/1303183005/

Base URL: https://chromium.googlesource.com/v8/v8.git@master

Affected files (+25, -0 lines):
  M DEPS
  M build/download_gold_plugin.py


Index: DEPS
diff --git a/DEPS b/DEPS
index 0c6cda6077c0d75680bd948bd9cc3ca1dea74742..c06da810796e4c0752daa9bdc4b1722ff26be7ed 100644
--- a/DEPS
+++ b/DEPS
@@ -103,6 +103,13 @@ hooks = [
     ],
   },
   {
+    # Pull gold plugin if needed or requested via GYP_DEFINES.
+    # Note: This must run before the clang update.
+    'name': 'gold_plugin',
+    'pattern': '.',
+    'action': ['python', 'v8/build/download_gold_plugin.py'],
+  },
+  {
     # Pull clang if needed or requested via GYP_DEFINES.
     # Note: On Win, this should run after win_toolchain, as it may use it.
     'name': 'clang',
Index: build/download_gold_plugin.py
diff --git a/build/download_gold_plugin.py b/build/download_gold_plugin.py
index 7a0c21b8d7077348f9ddbcdad6890e549d1b493c..f96d734e5d49b46feba0ef182080d7380ca5d221 100755
--- a/build/download_gold_plugin.py
+++ b/build/download_gold_plugin.py
@@ -8,6 +8,7 @@

 import json
 import os
+import re
 import shutil
 import subprocess
 import sys
@@ -30,7 +31,24 @@ CLANG_REVISION = os.popen(CLANG_UPDATE_PY + ' --print-revision').read().rstrip()

 CLANG_BUCKET = 'gs://chromium-browser-clang/Linux_x64'

+GOLD_PLUGIN_PATH = os.path.join(LLVM_BUILD_PATH, 'lib', 'LLVMgold.so')
+
+sys.path.insert(0, os.path.join(CHROME_SRC, 'tools', 'clang', 'scripts'))
+
+import update
+
 def main():
+  if not re.search(r'cfi_vptr=1', os.environ.get('GYP_DEFINES', '')):
+    # Bailout if this is not a cfi build.
+    print 'Skipping gold plugin download for non-cfi build.'
+    return 0
+  if (os.path.exists(GOLD_PLUGIN_PATH) and
+      update.ReadStampFile().strip() == update.PACKAGE_VERSION):
+ # Bailout if clang is up-to-date. This requires the script to be run before + # the clang update step! I.e. afterwards clang would always be up-to-date. + print 'Skipping gold plugin download. File present and clang up to date.'
+    return 0
+
   targz_name = 'llvmgold-%s.tgz' % CLANG_REVISION
   remote_path = '%s/%s' % (CLANG_BUCKET, targz_name)



--
--
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to