diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 10:22:43 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 12:36:28 +0000 |
commit | 271a6c3487a14599023a9106329505597638d793 (patch) | |
tree | e040d58ffc86c1480b79ca8528020ca9ec919bf8 /chromium/build/config/c++ | |
parent | 7b2ffa587235a47d4094787d72f38102089f402a (diff) |
BASELINE: Update Chromium to 77.0.3865.59
Change-Id: I1e89a5f3b009a9519a6705102ad65c92fe736f21
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/build/config/c++')
-rw-r--r-- | chromium/build/config/c++/BUILD.gn | 7 | ||||
-rw-r--r-- | chromium/build/config/c++/c++.gni | 5 | ||||
-rw-r--r-- | chromium/build/config/c++/libc++.natvis | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/chromium/build/config/c++/BUILD.gn b/chromium/build/config/c++/BUILD.gn index 45af7c85395..3845a270413 100644 --- a/chromium/build/config/c++/BUILD.gn +++ b/chromium/build/config/c++/BUILD.gn @@ -15,11 +15,6 @@ declare_args() { # TODO(thomasanderson): Set this to true by default once rL352899 is available # in MacOS's lldb. libcxx_abi_unstable = !((is_mac || is_ios) && is_debug && is_component_build) - - # Builds libcxx Natvis into the symbols for type visualization. - # Set to false to workaround http://crbug.com/966676 and - # http://crbug.com/966687. - libcxx_natvis_include = true } # TODO(xiaohuic): https://crbug/917533 Crashes on internal ChromeOS build. @@ -84,6 +79,8 @@ config("runtime_library") { # Add a debug visualizer for Microsoft's debuggers so that they can display # libc++ types well. if (libcxx_natvis_include) { + # chrome.natvis listed as an input in //buildtools/third_party/libc++ to + # guarantee relinking on changes. ldflags += [ "/NATVIS:" + rebase_path("libc++.natvis", root_build_dir) ] } } else { diff --git a/chromium/build/config/c++/c++.gni b/chromium/build/config/c++/c++.gni index b639ca7793c..834a943deca 100644 --- a/chromium/build/config/c++/c++.gni +++ b/chromium/build/config/c++/c++.gni @@ -23,6 +23,11 @@ declare_args() { # expected usage is to set use_custom_libcxx=false and # use_custom_libcxx_for_host=true in the passed in buildargs. use_custom_libcxx_for_host = false + + # Builds libcxx Natvis into the symbols for type visualization. + # Set to false to workaround http://crbug.com/966676 and + # http://crbug.com/966687. + libcxx_natvis_include = true } use_custom_libcxx = diff --git a/chromium/build/config/c++/libc++.natvis b/chromium/build/config/c++/libc++.natvis index 06160884447..2603e2e877a 100644 --- a/chromium/build/config/c++/libc++.natvis +++ b/chromium/build/config/c++/libc++.natvis @@ -53,7 +53,9 @@ <Type Name="std::__1::basic_string<char,*>"> <!--<Intrinsic Name="is_long" Expression="((__rep*)&__r_)->__s.__size_ & 0x80" />--> - <!-- The above doesn't work for reasons I don't understand. + <!-- The above doesn't work because of https://llvm.org/PR41615 + TODO(thakis): Now that we have clang r362038, try the above approach + again. The below assumes the alternate string layout and little endianness :/ --> <Intrinsic Name="is_long" |