-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Reland "[build] Pull binutils via DEPS""
This reverts commit 09c49ee. Reason for revert: Still breaks the node.js bot. Original change's description: > Reland "[build] Pull binutils via DEPS" > > This is a reland of 98bbb63 > > Original change's description: > > [build] Pull binutils via DEPS > > > > This pulls binutils from a subtreed repository of Chromium: > > https://chromium.googlesource.com/chromium/src/third_party/binutils/ > > > > Bug: chromium:718157 > > Change-Id: I532c7e84d83f716728e4f9f715cfdb82ea5d5f98 > > Reviewed-on: https://chromium-review.googlesource.com/c/1370043 > > Reviewed-by: Yang Guo <[email protected]> > > Reviewed-by: Sergiy Belozorov <[email protected]> > > Commit-Queue: Michael Achenbach <[email protected]> > > Cr-Commit-Position: refs/heads/master@{#58180} > > Bug: chromium:718157, v8:8584 > Change-Id: I1c9773bc5fa0a629e35db5151e535e63839f2801 > Reviewed-on: https://chromium-review.googlesource.com/c/1375655 > Reviewed-by: Sergiy Belozorov <[email protected]> > Commit-Queue: Michael Achenbach <[email protected]> > Cr-Commit-Position: refs/heads/master@{#58213} [email protected],[email protected],[email protected] Change-Id: I1935f4aef0d6eb4f58e25197d14ccf2c2c645b15 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: chromium:718157, v8:8584 Reviewed-on: https://chromium-review.googlesource.com/c/1375659 Reviewed-by: Michael Achenbach <[email protected]> Commit-Queue: Michael Achenbach <[email protected]> Cr-Commit-Position: refs/heads/master@{#58214}
- Loading branch information
Showing
7 changed files
with
194 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
binutils-* | ||
*-chroot-* | ||
output-* | ||
Linux_ia32/*stamp* | ||
Linux_ia32/*tar.bz2 | ||
Linux_x64/*stamp* | ||
Linux_x64/*tar.bz2 | ||
*/Release |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
c956d54d404eb1d35b3a4d88b7bfd34f2f06f7af |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
69bedb1192a03126687f75cb6cf1717758a1a59f |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
#!/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()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,102 @@ | ||
#!/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)) |