Remove ThinLTO Cache and rebase on upstream

c++17 adherance has been added upstream. Yay.
This commit is contained in:
Alexander David Frick 2021-12-02 02:44:29 -06:00 committed by GitHub
parent 04d7823cd8
commit f54fe2113b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -608,16 +608,8 @@ config("compiler") {
# are still a few buildbots using it, so until those are turned off
# we need the !is_nacl clause and the (is_nacl && is_clang) clause, above.
cflags_c += [ "-std=c11" ]
if (is_ios) {
# TODO(thakis): Use C++17 on iOS once it works.
cflags_cc += [
"-std=c++14",
"-fno-trigraphs",
]
} else {
cflags_cc += [ "-std=c++17" ]
}
}
if (is_clang && current_os != "zos") {
# C++17 removes trigraph support, but clang still warns that it ignores
@ -630,7 +622,7 @@ config("compiler") {
# default allocator happens to return. Starting with C++17, operator new
# called on aligned types with N > __STDCPP_DEFAULT_NEW_ALIGNMENT__ will
# call a special overload that hands in the desired alignment, and that will
# honor the alignas even for memory on the stack.
# honor the alignas even for memory on the heap.
# However, that requires that operator new overload to exist. At least on
# macOS and iOS, they are in libc++abi, and system libc++abi has them as of
# "macOS 10.12, iOS 10.0" (https://reviews.llvm.org/D112921#3128089).
@ -672,7 +664,7 @@ config("compiler") {
# Limit the size of the ThinLTO cache to the lesser of 10% of
# available disk space, 40GB and 100000 files.
cache_policy = "cache_size=10%:cache_size_bytes=40g:cache_size_files=100000"
# cache_policy = "cache_size=10%:cache_size_bytes=40g:cache_size_files=100000"
# TODO(gbiv): We ideally shouldn't need to specify this; ThinLTO
# should be able to better manage binary size increases on its own.
@ -682,9 +674,9 @@ config("compiler") {
ldflags += [
"/opt:lldltojobs=all",
"-mllvm:-import-instr-limit=$import_instr_limit",
"/lldltocache:" +
rebase_path("$root_out_dir/thinlto-cache", root_build_dir),
"/lldltocachepolicy:$cache_policy",
# "/lldltocache:" +
# rebase_path("$root_out_dir/thinlto-cache", root_build_dir),
# "/lldltocachepolicy:$cache_policy",
]
} else {
ldflags += [ "-flto=thin" ]
@ -704,11 +696,11 @@ config("compiler") {
rebase_path("$root_out_dir/thinlto-cache", root_build_dir) ]
} else {
ldflags +=
[ "-Wl,--thinlto-cache-dir=" +
rebase_path("$root_out_dir/thinlto-cache", root_build_dir) ]
# [ "-Wl,--thinlto-cache-dir=" +
# rebase_path("$root_out_dir/thinlto-cache", root_build_dir) ]
}
ldflags += [ "-Wl,--thinlto-cache-policy=$cache_policy" ]
# ldflags += [ "-Wl,--thinlto-cache-policy=$cache_policy" ]
if (is_chromeos_ash) {
# Not much performance difference was noted between the default (100)