<chromium> Do not directly override libc symbols from the library.

Instead we export _override symbols and add the symbol
renaming directly into the QtWebEngineProcess source.

Change-Id: I15049609dd77be6de2a2398f25a37fff1b6f5519
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

1 files changed, 0 insertions, 15 deletions

diff --git a/chromium/sandbox/linux/services/libc_interceptor.cc b/chromium/sandbox/linux/services/libc_interceptor.cc
index 906e1caf8ac..74245e4fe17 100644
--- a/chromium/sandbox/linux/services/libc_interceptor.cc
+++ b/chromium/sandbox/linux/services/libc_interceptor.cc
@@ -233,9 +233,6 @@ static void InitLibcLocaltimeFunctions() {
 // to set visibility attribute to "default" to export the symbol, as it is set
 // to "hidden" by default in chrome per build/common.gypi.
 __attribute__((__visibility__("default"))) struct tm* localtime_override(
-    const time_t* timep) __asm__("localtime");
-
-__attribute__((__visibility__("default"))) struct tm* localtime_override(
     const time_t* timep) {
   if (g_am_zygote_or_renderer && g_use_localtime_override) {
     static struct tm time_struct;
@@ -257,10 +254,6 @@ __attribute__((__visibility__("default"))) struct tm* localtime_override(
   return res;
 }
 
-// Use same trick to override localtime64(), localtime_r() and localtime64_r().
-__attribute__((__visibility__("default"))) struct tm* localtime64_override(
-    const time_t* timep) __asm__("localtime64");
-
 __attribute__((__visibility__("default"))) struct tm* localtime64_override(
     const time_t* timep) {
   if (g_am_zygote_or_renderer && g_use_localtime_override) {
@@ -285,10 +278,6 @@ __attribute__((__visibility__("default"))) struct tm* localtime64_override(
 
 __attribute__((__visibility__("default"))) struct tm* localtime_r_override(
     const time_t* timep,
-    struct tm* result) __asm__("localtime_r");
-
-__attribute__((__visibility__("default"))) struct tm* localtime_r_override(
-    const time_t* timep,
     struct tm* result) {
   if (g_am_zygote_or_renderer && g_use_localtime_override) {
     ProxyLocaltimeCallToBrowser(*timep, result, nullptr, 0);
@@ -309,10 +298,6 @@ __attribute__((__visibility__("default"))) struct tm* localtime_r_override(
 
 __attribute__((__visibility__("default"))) struct tm* localtime64_r_override(
     const time_t* timep,
-    struct tm* result) __asm__("localtime64_r");
-
-__attribute__((__visibility__("default"))) struct tm* localtime64_r_override(
-    const time_t* timep,
     struct tm* result) {
   if (g_am_zygote_or_renderer && g_use_localtime_override) {
     ProxyLocaltimeCallToBrowser(*timep, result, nullptr, 0);