diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2017-06-26 20:36:28 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-08-14 09:38:24 +0000 |
| commit | 582c5493439ba9ac57c6c14c706f530741f5bfc8 (patch) | |
| tree | 0d8dbf10f71caa9dc1782fac9b4ae3d0936fdbbf | |
| parent | 3deea958f1485b50940e7437c0a3b73ed29ee134 (diff) | |
| download | qtwebengine-chromium-58-based.tar.gz | |
Do not export c memory handling functions58-based
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 <allan.jensen@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | chromium/base/process/memory_linux.cc | 2 |
1 files changed, 2 insertions, 0 deletions
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 |