summaryrefslogtreecommitdiff
path: root/chromium/components/nacl
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-12-10 16:19:40 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-12-10 16:01:50 +0000
commit51f6c2793adab2d864b3d2b360000ef8db1d3e92 (patch)
tree835b3b4446b012c75e80177cef9fbe6972cc7dbe /chromium/components/nacl
parent6036726eb981b6c4b42047513b9d3f4ac865daac (diff)
downloadqtwebengine-chromium-51f6c2793adab2d864b3d2b360000ef8db1d3e92.tar.gz
BASELINE: Update Chromium to 71.0.3578.93
Change-Id: I6a32086c33670e1b033f8b10e6bf1fd4da1d105d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/components/nacl')
-rw-r--r--chromium/components/nacl/loader/BUILD.gn8
1 files changed, 8 insertions, 0 deletions
diff --git a/chromium/components/nacl/loader/BUILD.gn b/chromium/components/nacl/loader/BUILD.gn
index a3096b7cb7d..b0085145a65 100644
--- a/chromium/components/nacl/loader/BUILD.gn
+++ b/chromium/components/nacl/loader/BUILD.gn
@@ -146,6 +146,14 @@ if (is_linux) {
# Force libgcc as a workaround. See https://crbug.com/761103
ldflags += [ "-rtlib=libgcc" ]
+ # nacl_helper needs to link with libgcc_s. We already have -lgcc_s in
+ # the final link command line, but it was placed within "--as-needed"
+ # with the result that the dependency gets dropped. Similarly, we need
+ # to add this via "ldflags" and not "libs" because libraries added via
+ # the latter are also placed within an "--as-needed"'.
+ # See https://crbug.com/884017
+ ldflags += [ "-lgcc_s" ]
+
# Nacl crashes when enabling ThinLTO. See https://crbug.com/799642
# We haven't triaged down to the root cause yet. For now, disabling
# dead function removal from LTO optimization is a workaround, so that