From 582c5493439ba9ac57c6c14c706f530741f5bfc8 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Mon, 26 Jun 2017 20:36:28 +0200 Subject: Do not export c memory handling functions We need to export dummy symbols to keep C-ABI Unfortuinately symbol version assembly does not work if these symbols get redefined here. These extra allocations are checking and logging "Out of memory" Task-number: QTBUG-61521 Change-Id: Iea8c7cbf873cee40921000720451653842b03c07 Reviewed-by: Allan Sandfeld Jensen Reviewed-by: Alexandru Croitor --- chromium/base/process/memory_linux.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'chromium/base/process/memory_linux.cc') diff --git a/chromium/base/process/memory_linux.cc b/chromium/base/process/memory_linux.cc index 985bc54eb64..9a2213e9535 100644 --- a/chromium/base/process/memory_linux.cc +++ b/chromium/base/process/memory_linux.cc @@ -60,6 +60,7 @@ void* __libc_pvalloc(size_t size); #endif void* __libc_memalign(size_t alignment, size_t size); +#if !defined(TOOLKIT_QT) // QTBUG-61521,QTBUG-60565 // Overriding the system memory allocation functions: // // For security reasons, we want malloc failures to be fatal. Too much code @@ -129,6 +130,7 @@ int posix_memalign(void** ptr, size_t alignment, size_t size) { *ptr = memalign(alignment, size); return 0; } +#endif // TOOLKIT_QT } // extern C -- cgit v1.2.1