diff options
8 files changed, 8 insertions, 34 deletions
diff --git a/build/common.gypi b/build/common.gypi index 565dd17..f937328 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -4555,13 +4555,9 @@ '-fsanitize=memory', '-fsanitize-memory-track-origins=<(msan_track_origins)', '-fsanitize-blacklist=<(msan_blacklist)', - # TODO(eugenis): Remove when msan migrates to new ABI (crbug.com/560589). - '-fPIC', ], 'ldflags': [ '-fsanitize=memory', - # TODO(eugenis): Remove when msan migrates to new ABI (crbug.com/560589). - '-pie', ], 'defines': [ 'MEMORY_SANITIZER', diff --git a/build/config/sanitizers/BUILD.gn b/build/config/sanitizers/BUILD.gn index 2adab21..193f19a 100644 --- a/build/config/sanitizers/BUILD.gn +++ b/build/config/sanitizers/BUILD.gn @@ -36,12 +36,7 @@ config("sanitizer_options_link_helper") { ldflags += [ "-fsanitize=thread" ] } if (is_msan) { - ldflags += [ - "-fsanitize=memory", - - # TODO(eugenis): Remove when msan migrates to new ABI (crbug.com/560589). - "-pie", - ] + ldflags += [ "-fsanitize=memory" ] } if (is_ubsan) { ldflags += [ "-fsanitize=undefined" ] @@ -144,9 +139,6 @@ config("default_sanitizer_flags") { "-fsanitize=memory", "-fsanitize-memory-track-origins=$msan_track_origins", "-fsanitize-blacklist=$msan_blacklist_path", - - # TODO(eugenis): Remove when msan migrates to new ABI (crbug.com/560589). - "-fPIC", ] } if (is_ubsan) { diff --git a/third_party/instrumented_libraries/binaries/msan-chained-origins-precise.tgz.sha1 b/third_party/instrumented_libraries/binaries/msan-chained-origins-precise.tgz.sha1 index 71e2def..20136d1 100644 --- a/third_party/instrumented_libraries/binaries/msan-chained-origins-precise.tgz.sha1 +++ b/third_party/instrumented_libraries/binaries/msan-chained-origins-precise.tgz.sha1 @@ -1 +1 @@ -60669b8a67026d92b365c1a2cab756bfe2fdd90f
\ No newline at end of file +b222c7d98598d5322e3ef5e114d625b5067db731
\ No newline at end of file diff --git a/third_party/instrumented_libraries/binaries/msan-chained-origins-trusty.tgz.sha1 b/third_party/instrumented_libraries/binaries/msan-chained-origins-trusty.tgz.sha1 index 193be34..02e2f50 100644 --- a/third_party/instrumented_libraries/binaries/msan-chained-origins-trusty.tgz.sha1 +++ b/third_party/instrumented_libraries/binaries/msan-chained-origins-trusty.tgz.sha1 @@ -1 +1 @@ -348b21c99365227beb378e6f068984b0f6ea9f9f
\ No newline at end of file +1ec036d6a13816e27b580906924a3f2e02e34f64
\ No newline at end of file diff --git a/third_party/instrumented_libraries/binaries/msan-no-origins-precise.tgz.sha1 b/third_party/instrumented_libraries/binaries/msan-no-origins-precise.tgz.sha1 index 9f17c0d..988a11e 100644 --- a/third_party/instrumented_libraries/binaries/msan-no-origins-precise.tgz.sha1 +++ b/third_party/instrumented_libraries/binaries/msan-no-origins-precise.tgz.sha1 @@ -1 +1 @@ -2a66a901c3b0acd3e5c5cbf49ddfa442f77bb38e
\ No newline at end of file +5d414da3a7a4e1341c8c0b45b9c4e08931861b98
\ No newline at end of file diff --git a/third_party/instrumented_libraries/binaries/msan-no-origins-trusty.tgz.sha1 b/third_party/instrumented_libraries/binaries/msan-no-origins-trusty.tgz.sha1 index bbe6657..8ab5d98 100644 --- a/third_party/instrumented_libraries/binaries/msan-no-origins-trusty.tgz.sha1 +++ b/third_party/instrumented_libraries/binaries/msan-no-origins-trusty.tgz.sha1 @@ -1 +1 @@ -098097aa3f25d94b73014c9249a41bfe37f3242b
\ No newline at end of file +86fc3acddd6561c11ffdafbc1ab326b14ac45c7b
\ No newline at end of file diff --git a/tools/clang/scripts/package.py b/tools/clang/scripts/package.py index a758a7b..0a18d75 100755 --- a/tools/clang/scripts/package.py +++ b/tools/clang/scripts/package.py @@ -66,11 +66,6 @@ def main(): return 1 parser = argparse.ArgumentParser(description='build and package clang') - parser.add_argument('--gcc-toolchain', - help="the prefix for the GCC version used for building. " - "For /opt/foo/bin/gcc, pass " - "'--gcc-toolchain '/opt/foo'") - args = parser.parse_args() with open('buildlog.txt', 'w') as log: @@ -110,8 +105,6 @@ def main(): build_cmd = [sys.executable, os.path.join(THIS_DIR, 'update.py'), '--bootstrap', '--force-local-build', '--run-tests'] - if args.gcc_toolchain is not None: - build_cmd.extend(['--gcc-toolchain', args.gcc_toolchain]) TeeCmd(build_cmd, log) stamp = open(STAMP_FILE).read().rstrip() @@ -146,6 +139,8 @@ def main(): 'lib/clang/*/lib/darwin/*profile_osx*', ]) elif sys.platform.startswith('linux'): + # Copy the stdlibc++.so.6 we linked Clang against so it can run. + want.append('lib/libstdc++.so.6') # Copy only # lib/clang/*/lib/linux/libclang_rt.{[atm]san,san,ubsan,profile}-*.a , # but not dfsan. @@ -160,9 +155,6 @@ def main(): 'lib/clang/*/lib/windows/clang_rt.asan*.lib', 'lib/clang/*/include_sanitizer/*', ]) - if args.gcc_toolchain is not None: - # Copy the stdlibc++.so.6 we linked Clang against so it can run. - want.append('lib/libstdc++.so.6') for root, dirs, files in os.walk(LLVM_RELEASE_DIR): # root: third_party/llvm-build/Release+Asserts/lib/..., rel_root: lib/... diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py index db7df2a..3f70c6c 100755 --- a/tools/clang/scripts/update.py +++ b/tools/clang/scripts/update.py @@ -8,7 +8,6 @@ It is also used by package.py to build the prebuilt clang binaries.""" import argparse -import cStringIO import distutils.spawn import glob import os @@ -20,14 +19,13 @@ import stat import sys import tarfile import tempfile -import time import urllib2 import zipfile # 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 = '254049' +CLANG_REVISION = '254793' use_head_revision = 'LLVM_FORCE_HEAD_REVISION' in os.environ if use_head_revision: @@ -516,10 +514,6 @@ def UpdateClang(args): cflags += ['-DLLVM_FORCE_HEAD_REVISION'] cxxflags += ['-DLLVM_FORCE_HEAD_REVISION'] - # Pin MSan to the old ABI. - # TODO(eugenis): Remove when MSan migrates to new ABI (crbug.com/560589). - cxxflags += [ '-DMSAN_LINUX_X86_64_OLD_MAPPING' ] - CreateChromeToolsShim() deployment_env = None |