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: I209a7dcf42772bb993e966f253dd2d1c7013dceb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

1 files changed, 0 insertions, 14 deletions

diff --git a/chromium/content/zygote/zygote_main_linux.cc b/chromium/content/zygote/zygote_main_linux.cc
index 8e91c2f17e5..2e5cc7e98d5 100644
--- a/chromium/content/zygote/zygote_main_linux.cc
+++ b/chromium/content/zygote/zygote_main_linux.cc
@@ -181,8 +181,6 @@ static void InitLibcLocaltimeFunctions() {
 // references to localtime() will resolve to this function. Notice that we need
 // 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) {
@@ -199,10 +197,6 @@ struct tm* localtime_override(const time_t* timep) {
   }
 }
 
-// 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) {
@@ -219,10 +213,6 @@ struct tm* localtime64_override(const time_t* timep) {
 }
 
 __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) {
     ProxyLocaltimeCallToBrowser(*timep, result, NULL, 0);
@@ -235,10 +225,6 @@ struct tm* localtime_r_override(const time_t* timep, struct tm* result) {
 }
 
 __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) {
     ProxyLocaltimeCallToBrowser(*timep, result, NULL, 0);