Linux: Fix ld.lld: error: relocation R_X86_64_TPOFF32 cannot be used with -shared

This commit is contained in:
Marshall Greenblatt 2021-08-24 17:33:27 -04:00
parent 92f67ee847
commit 0fa40110e3
2 changed files with 19 additions and 0 deletions

View File

@ -395,6 +395,12 @@ patches = [
# https://bitbucket.org/chromiumembedded/cef/issues/1936 # https://bitbucket.org/chromiumembedded/cef/issues/1936
'name': 'linux_assets_path_1936', 'name': 'linux_assets_path_1936',
}, },
{
# Linux: Fix ld.lld: error: relocation R_X86_64_TPOFF32 against
# blink::g_thread_specific_ cannot be used with -shared
# https://groups.google.com/a/chromium.org/g/blink-dev/c/wx0gZFCY3p4/m/iLBHRi0ZAQAJ
'name': 'linux_blink_thread_local',
},
{ {
# Linux: Avoid usage of chrome::FILE_COMPONENT_WIDEVINE_CDM_HINT. # Linux: Avoid usage of chrome::FILE_COMPONENT_WIDEVINE_CDM_HINT.
# https://bitbucket.org/chromiumembedded/cef/issues/3149 # https://bitbucket.org/chromiumembedded/cef/issues/3149

View File

@ -0,0 +1,13 @@
diff --git third_party/blink/renderer/platform/heap/v8_wrapper/thread_local.h third_party/blink/renderer/platform/heap/v8_wrapper/thread_local.h
index 1a0c43b0eaf45..184155c81b08b 100644
--- third_party/blink/renderer/platform/heap/v8_wrapper/thread_local.h
+++ third_party/blink/renderer/platform/heap/v8_wrapper/thread_local.h
@@ -36,7 +36,7 @@
#if BLINK_HEAP_HIDE_THREAD_LOCAL_IN_LIBRARY
#define BLINK_HEAP_THREAD_LOCAL_MODEL "local-dynamic"
#else
-#if defined(OS_WIN)
+#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MAC))
#define BLINK_HEAP_THREAD_LOCAL_MODEL "initial-exec"
#elif defined(OS_ANDROID)
#define BLINK_HEAP_THREAD_LOCAL_MODEL "local-dynamic"