Commit 6c252711 authored by Reid Kleckner's avatar Reid Kleckner Committed by Commit Bot

Roll clang 338452:340740

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.

Bug: 871418, 872926
Change-Id: Ic02dcfbf17c4190fc4359271d880b7e65bf7ba27
Reviewed-on: https://chromium-review.googlesource.com/1182196
Commit-Queue: Reid Kleckner <rnk@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Reviewed-by: default avatarPeter Collingbourne <pcc@chromium.org>
Reviewed-by: default avatarHans Wennborg <hans@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#586816}
parent e007029d
......@@ -613,10 +613,6 @@ config("compiler") {
cflags_cc += [ "-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
# optimizations/transformations that require whole-program visibility at link
......
......@@ -48,12 +48,7 @@ hermetic_xcode_path =
declare_args() {
if (is_clang) {
# Clang compiler version. Clang files are placed at version-dependent paths.
if (llvm_force_head_revision) {
clang_version = "8.0.0"
} else {
# TODO(hans): Trunk version was updated; remove after the next roll.
clang_version = "7.0.0"
}
clang_version = "8.0.0"
}
}
......
......@@ -27,7 +27,7 @@ import zipfile
# 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
# Reverting problematic clang rolls is safe, though.
CLANG_REVISION = '338452'
CLANG_REVISION = '340740'
use_head_revision = bool(os.environ.get('LLVM_FORCE_HEAD_REVISION', '0')
in ('1', 'YES'))
......@@ -68,7 +68,7 @@ LLVM_BUILD_TOOLS_DIR = os.path.abspath(
os.path.join(LLVM_DIR, '..', 'llvm-build-tools'))
STAMP_FILE = os.path.normpath(
os.path.join(LLVM_DIR, '..', 'llvm-build', 'cr_build_revision'))
VERSION = '7.0.0'
VERSION = '8.0.0'
ANDROID_NDK_DIR = os.path.join(
CHROMIUM_DIR, 'third_party', 'android_ndk')
......@@ -485,14 +485,6 @@ def UpdateClang(args):
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)
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