Commit d54494cb authored by Hans Wennborg's avatar Hans Wennborg Committed by Commit Bot

Roll clang 338452:340925

Update clang_version from 7.0.0 to 8.0.0 and remove the code to remove
the old library directory.

Remove the _LIBCPP_HIDE_FROM_ABI define, it is no longer needed.

R=hans@chromium.org,thakis@chromium.org

Bug: 871418, 872926
Change-Id: Ibf6734500aa75a349fa772b225b8b15fddfe3661
Reviewed-on: https://chromium-review.googlesource.com/1194698Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587602}
parent 66de93d3
...@@ -613,10 +613,6 @@ config("compiler") { ...@@ -613,10 +613,6 @@ config("compiler") {
cflags_cc += [ "-stdlib=libc++" ] cflags_cc += [ "-stdlib=libc++" ]
ldflags += [ "-stdlib=libc++" ] ldflags += [ "-stdlib=libc++" ]
} }
if (is_ios || is_mac) {
# Avoid symbol table size growth after libc++ r338122; see crbug.com/872926.
defines += [ "_LIBCPP_HIDE_FROM_ABI=_LIBCPP_HIDDEN _LIBCPP_ALWAYS_INLINE" ]
}
# Add flags for link-time optimization. These flags enable # Add flags for link-time optimization. These flags enable
# optimizations/transformations that require whole-program visibility at link # optimizations/transformations that require whole-program visibility at link
......
...@@ -48,12 +48,7 @@ hermetic_xcode_path = ...@@ -48,12 +48,7 @@ hermetic_xcode_path =
declare_args() { declare_args() {
if (is_clang) { if (is_clang) {
# Clang compiler version. Clang files are placed at version-dependent paths. # Clang compiler version. Clang files are placed at version-dependent paths.
if (llvm_force_head_revision) { clang_version = "8.0.0"
clang_version = "8.0.0"
} else {
# TODO(hans): Trunk version was updated; remove after the next roll.
clang_version = "7.0.0"
}
} }
} }
......
...@@ -27,7 +27,7 @@ import zipfile ...@@ -27,7 +27,7 @@ import zipfile
# Do NOT CHANGE this if you don't know what you're doing -- see # Do NOT CHANGE this if you don't know what you're doing -- see
# https://chromium.googlesource.com/chromium/src/+/master/docs/updating_clang.md # https://chromium.googlesource.com/chromium/src/+/master/docs/updating_clang.md
# Reverting problematic clang rolls is safe, though. # Reverting problematic clang rolls is safe, though.
CLANG_REVISION = '338452' CLANG_REVISION = '340925'
use_head_revision = bool(os.environ.get('LLVM_FORCE_HEAD_REVISION', '0') use_head_revision = bool(os.environ.get('LLVM_FORCE_HEAD_REVISION', '0')
in ('1', 'YES')) in ('1', 'YES'))
...@@ -68,7 +68,7 @@ LLVM_BUILD_TOOLS_DIR = os.path.abspath( ...@@ -68,7 +68,7 @@ LLVM_BUILD_TOOLS_DIR = os.path.abspath(
os.path.join(LLVM_DIR, '..', 'llvm-build-tools')) os.path.join(LLVM_DIR, '..', 'llvm-build-tools'))
STAMP_FILE = os.path.normpath( STAMP_FILE = os.path.normpath(
os.path.join(LLVM_DIR, '..', 'llvm-build', 'cr_build_revision')) os.path.join(LLVM_DIR, '..', 'llvm-build', 'cr_build_revision'))
VERSION = '7.0.0' VERSION = '8.0.0'
ANDROID_NDK_DIR = os.path.join( ANDROID_NDK_DIR = os.path.join(
CHROMIUM_DIR, 'third_party', 'android_ndk') CHROMIUM_DIR, 'third_party', 'android_ndk')
...@@ -485,14 +485,6 @@ def UpdateClang(args): ...@@ -485,14 +485,6 @@ def UpdateClang(args):
print 'Locally building Clang %s...' % PACKAGE_VERSION print 'Locally building Clang %s...' % PACKAGE_VERSION
if use_head_revision:
# TODO(hans): Trunk version was updated; remove after the next roll.
# Remove the old lib dir.
old_lib_dir = os.path.join(LLVM_BUILD_DIR, 'lib', 'clang', '7.0.0')
if (os.path.isdir(old_lib_dir)):
print 'Removing old lib dir: %s' % old_lib_dir
RmTree(old_lib_dir)
AddCMakeToPath(args) AddCMakeToPath(args)
AddGnuWinToPath() AddGnuWinToPath()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment