diff --git a/.gitignore b/.gitignore index f42b5647b3..b6af9e2cc1 100644 --- a/.gitignore +++ b/.gitignore @@ -58,7 +58,6 @@ /test/wasm-spec-tests/tests.tar.gz /third_party/* !/third_party/antlr4 -!/third_party/binutils !/third_party/eu-strip !/third_party/inspector_protocol !/third_party/colorama diff --git a/DEPS b/DEPS index 919efb5ba7..ace1a76ccd 100644 --- a/DEPS +++ b/DEPS @@ -15,6 +15,8 @@ vars = { } deps = { + 'v8/third_party/binutils': + Var('chromium_url') + '/chromium/src/third_party/binutils.git' + '@' + '2be73f7fbf783d7a0b288e174a5773b67c7656bc', 'v8/build': Var('chromium_url') + '/chromium/src/build.git' + '@' + 'e25071980f7fdfd7565f19b28b37cd31c88afbae', 'v8/third_party/depot_tools': @@ -324,10 +326,11 @@ hooks = [ # Pull binutils for linux, enabled debug fission for faster linking / # debugging when used with clang on Ubuntu Precise. # https://code.google.com/p/chromium/issues/detail?id=352046 + # Only x64 and x86 binaries are provided so skip this step on other platforms. { 'name': 'binutils', 'pattern': 'v8/third_party/binutils', - 'condition': 'host_os == "linux"', + 'condition': 'host_os == "linux" and (host_cpu == "x64" or host_cpu == "x86")', 'action': [ 'python', 'v8/third_party/binutils/download.py', diff --git a/third_party/binutils/.gitignore b/third_party/binutils/.gitignore deleted file mode 100644 index 5605b2f711..0000000000 --- a/third_party/binutils/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -binutils-* -*-chroot-* -output-* -Linux_ia32/*stamp* -Linux_ia32/*tar.bz2 -Linux_x64/*stamp* -Linux_x64/*tar.bz2 -*/Release diff --git a/third_party/binutils/Linux_ia32/binutils.tar.bz2.sha1 b/third_party/binutils/Linux_ia32/binutils.tar.bz2.sha1 deleted file mode 100644 index aaed4ddbad..0000000000 --- a/third_party/binutils/Linux_ia32/binutils.tar.bz2.sha1 +++ /dev/null @@ -1 +0,0 @@ -c956d54d404eb1d35b3a4d88b7bfd34f2f06f7af \ No newline at end of file diff --git a/third_party/binutils/Linux_x64/binutils.tar.bz2.sha1 b/third_party/binutils/Linux_x64/binutils.tar.bz2.sha1 deleted file mode 100644 index dfa4fefbd5..0000000000 --- a/third_party/binutils/Linux_x64/binutils.tar.bz2.sha1 +++ /dev/null @@ -1 +0,0 @@ -69bedb1192a03126687f75cb6cf1717758a1a59f \ No newline at end of file diff --git a/third_party/binutils/detect_v8_host_arch.py b/third_party/binutils/detect_v8_host_arch.py deleted file mode 100644 index 3a5a5762d9..0000000000 --- a/third_party/binutils/detect_v8_host_arch.py +++ /dev/null @@ -1,80 +0,0 @@ -#!/usr/bin/env python -# Copyright 2014 the V8 project authors. All rights reserved. -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""Outputs host CPU architecture in format recognized by gyp.""" - -import platform -import re -import sys - - -def main(): - print DoMain([]) - return 0 - -def DoMain(_): - return DetectHostArch(); - -def DetectHostArch(): - """Hook to be called from gyp without starting a separate python - interpreter.""" - host_arch = platform.machine() - host_system = platform.system(); - - # Convert machine type to format recognized by gyp. - if re.match(r'i.86', host_arch) or host_arch == 'i86pc': - host_arch = 'ia32' - elif host_arch in ['x86_64', 'amd64']: - host_arch = 'x64' - elif host_arch.startswith('arm'): - host_arch = 'arm' - elif host_arch == 'aarch64': - host_arch = 'arm64' - elif host_arch == 'mips64': - host_arch = 'mips64el' - elif host_arch.startswith('mips'): - host_arch = 'mipsel' - - # Under AIX the value returned by platform.machine is not - # the best indicator of the host architecture - # AIX 6.1 which is the lowest level supported only provides - # a 64 bit kernel - if host_system == 'AIX': - host_arch = 'ppc64' - - # platform.machine is based on running kernel. It's possible to use 64-bit - # kernel with 32-bit userland, e.g. to give linker slightly more memory. - # Distinguish between different userland bitness by querying - # the python binary. - if host_arch == 'x64' and platform.architecture()[0] == '32bit': - host_arch = 'ia32' - - return host_arch - -if __name__ == '__main__': - sys.exit(main()) diff --git a/third_party/binutils/download.py b/third_party/binutils/download.py deleted file mode 100755 index b3be6414e2..0000000000 --- a/third_party/binutils/download.py +++ /dev/null @@ -1,102 +0,0 @@ -#!/usr/bin/env python -# Copyright 2014 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. -# vim: set ts=2 sw=2 et sts=2 ai: - -"""Minimal tool to download binutils from Google storage. - -TODO(mithro): Replace with generic download_and_extract tool. -""" - -import os -import platform -import re -import shutil -import subprocess -import sys -from detect_v8_host_arch import DetectHostArch - - -BINUTILS_DIR = os.path.abspath(os.path.dirname(__file__)) -BINUTILS_FILE = 'binutils.tar.bz2' -BINUTILS_TOOLS = ['bin/ld.gold', 'bin/objcopy', 'bin/objdump'] -BINUTILS_OUT = 'Release' - - -def ReadFile(filename): - with file(filename, 'r') as f: - return f.read().strip() - - -def WriteFile(filename, content): - assert not os.path.exists(filename) - with file(filename, 'w') as f: - f.write(content) - f.write('\n') - - -def FetchAndExtract(arch): - archdir = os.path.join(BINUTILS_DIR, 'Linux_' + arch) - tarball = os.path.join(archdir, BINUTILS_FILE) - outdir = os.path.join(archdir, BINUTILS_OUT) - - sha1file = tarball + '.sha1' - if not os.path.exists(sha1file): - print "WARNING: No binutils found for your architecture (%s)!" % arch - return 0 - - checksum = ReadFile(sha1file) - - stampfile = tarball + '.stamp' - if os.path.exists(stampfile): - if (os.path.exists(tarball) and - os.path.exists(outdir) and - checksum == ReadFile(stampfile)): - return 0 - else: - os.unlink(stampfile) - - print "Downloading", tarball - subprocess.check_call([ - 'download_from_google_storage', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-binutils', - '-s', sha1file]) - assert os.path.exists(tarball) - - if os.path.exists(outdir): - shutil.rmtree(outdir) - assert not os.path.exists(outdir) - os.makedirs(outdir) - assert os.path.exists(outdir) - - print "Extracting", tarball - subprocess.check_call(['tar', 'axf', tarball], cwd=outdir) - - for tool in BINUTILS_TOOLS: - assert os.path.exists(os.path.join(outdir, tool)) - - WriteFile(stampfile, checksum) - return 0 - - -def main(args): - if not sys.platform.startswith('linux'): - return 0 - - arch = DetectHostArch() - if arch == 'x64': - return FetchAndExtract(arch) - if arch == 'ia32': - ret = FetchAndExtract(arch) - if ret != 0: - return ret - # Fetch the x64 toolchain as well for official bots with 64-bit kernels. - return FetchAndExtract('x64') - return 0 - - -if __name__ == '__main__': - sys.exit(main(sys.argv))