X-Git-Url: http://gitweb/?a=blobdiff_plain;f=chromium%2Fchromium-exclude_unwind_tables.patch;h=1961f15e412df9bcec1ff28440069e3eae00259f;hb=a35dd6c00dfc4a48f2c99a37d840e770b3f84599;hp=67232595dd4c50a04d0c6ae66106571f92ffaa14;hpb=c6d538bfc710156a29bf66cf27bde094f7e322f0;p=ports%2Fopt-arm.git

diff --git a/chromium/chromium-exclude_unwind_tables.patch b/chromium/chromium-exclude_unwind_tables.patch
index 6723259..1961f15 100644
--- a/chromium/chromium-exclude_unwind_tables.patch
+++ b/chromium/chromium-exclude_unwind_tables.patch
@@ -1,21 +1,8 @@
-From 1fc37227522ccd314f82ec893ed15c6129296604 Mon Sep 17 00:00:00 2001
-From: Paul Jensen <pauljensen@chromium.org>
-Date: Wed, 11 Oct 2017 08:37:34 -0400
-Subject: [PATCH] Move exclude_unwind_tables back into declare_args
-
-There is desire to adjust this flag manually.
-
-BUG=762629
-R=thakis@chromium.org
-
-Change-Id: I3bd134c19270cd1f729b3ea078674e734493d4ab
----
-
 diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
 index ad40fd9..50e19a4 100644
 --- a/build/config/compiler/compiler.gni
 +++ b/build/config/compiler/compiler.gni
-@@ -68,18 +68,18 @@
+@@ -68,19 +68,19 @@
  
    # Whether or not we should use position independent code.
    use_pic = true
@@ -25,8 +12,9 @@ index ad40fd9..50e19a4 100644
 +  # server. For unofficial (e.g. development) builds and non-Chrome branded
 +  # (e.g. Cronet which doesn't use Crashpad, crbug.com/479283) builds it's
 +  # useful to be able to unwind at runtime.
-+  exclude_unwind_tables = (is_chrome_branded && is_official_build) ||
-+                          (is_chromecast && !is_cast_desktop_build && !is_debug)
++  exclude_unwind_tables =
++      (is_chrome_branded && is_official_build) ||
++      (is_chromecast && !is_cast_desktop_build && !is_debug && !is_fuchsia)
  }
  
  assert(!is_cfi || use_thin_lto, "CFI requires ThinLTO")
@@ -36,8 +24,9 @@ index ad40fd9..50e19a4 100644
 -# For unofficial (e.g. development) builds and non-Chrome branded (e.g. Cronet
 -# which doesn't use Crashpad, crbug.com/479283) builds it's useful to be able
 -# to unwind at runtime.
--exclude_unwind_tables = (is_chrome_branded && is_official_build) ||
--                        (is_chromecast && !is_cast_desktop_build && !is_debug)
+-exclude_unwind_tables =
+-    (is_chrome_branded && is_official_build) ||
+-    (is_chromecast && !is_cast_desktop_build && !is_debug && !is_fuchsia)
 -
  # If true, optimize for size. Does not affect windows builds.
  # Linux & Mac favor speed over size.