From f29d569cd33a73da5ad675f43a34ad53c5cc9bc6 Mon Sep 17 00:00:00 2001 From: davidovski Date: Thu, 2 Feb 2023 14:10:02 +0000 Subject: Work --- .../qt5-qtwebengine/qt-musl-dispatch_to_musl.patch | 103 --------------------- 1 file changed, 103 deletions(-) delete mode 100644 repo/qt5-qtwebengine/qt-musl-dispatch_to_musl.patch (limited to 'repo/qt5-qtwebengine/qt-musl-dispatch_to_musl.patch') diff --git a/repo/qt5-qtwebengine/qt-musl-dispatch_to_musl.patch b/repo/qt5-qtwebengine/qt-musl-dispatch_to_musl.patch deleted file mode 100644 index a58a688..0000000 --- a/repo/qt5-qtwebengine/qt-musl-dispatch_to_musl.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- a/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc -+++ b/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc -@@ -8,6 +8,7 @@ - #include - #include - -+#if defined(__GLIBC__) - // This translation unit defines a default dispatch for the allocator shim which - // routes allocations to libc functions. - // The code here is strongly inspired from tcmalloc's libc_override_glibc.h. -@@ -87,3 +88,92 @@ const AllocatorDispatch AllocatorDispatc - nullptr, /* aligned_free_function */ - nullptr, /* next */ - }; -+ -+#else // defined(__GLIBC__) -+ -+#include -+ -+extern "C" { -+// Declare function pointers to the memory functions -+typedef void* (*t_libc_malloc)(size_t size); -+typedef void* (*t_libc_calloc)(size_t n, size_t size); -+typedef void* (*t_libc_realloc)(void* address, size_t size); -+typedef void* (*t_libc_memalign)(size_t alignment, size_t size); -+typedef void (*t_libc_free)(void* ptr); -+typedef size_t (*t_libc_malloc_usable_size)(void* ptr); -+ -+// Static instances of pointers to libc.so dl symbols -+static t_libc_malloc libc_malloc = NULL; -+static t_libc_calloc libc_calloc = NULL; -+static t_libc_realloc libc_realloc = NULL; -+static t_libc_memalign libc_memalign = NULL; -+static t_libc_free libc_free = NULL; -+static t_libc_malloc_usable_size libc_malloc_usable_size = NULL; -+ -+// resolve the symbols in libc.so -+void musl_libc_memory_init(void) -+{ -+ libc_malloc = (t_libc_malloc) dlsym(RTLD_NEXT, "malloc"); -+ libc_calloc = (t_libc_calloc) dlsym(RTLD_NEXT, "calloc"); -+ libc_realloc = (t_libc_realloc) dlsym(RTLD_NEXT, "realloc"); -+ libc_memalign = (t_libc_memalign) dlsym(RTLD_NEXT, "memalign"); -+ libc_free = (t_libc_free) dlsym(RTLD_NEXT, "free"); -+ libc_malloc_usable_size = (t_libc_malloc_usable_size) dlsym(RTLD_NEXT, "malloc_usable_size"); -+} -+} // extern "C" -+ -+namespace { -+ -+using base::allocator::AllocatorDispatch; -+ -+void* MuslMalloc(const AllocatorDispatch*, size_t size, void* context) { -+ if (!libc_malloc) -+ musl_libc_memory_init(); -+ return (*libc_malloc)(size); -+} -+ -+void* MuslCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) { -+ if (!libc_calloc) -+ musl_libc_memory_init(); -+ return (*libc_calloc)(n, size); -+} -+ -+void* MuslRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) { -+ if (!libc_realloc) -+ musl_libc_memory_init(); -+ return (*libc_realloc)(address, size); -+} -+ -+void* MuslMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) { -+ if (!libc_memalign) -+ musl_libc_memory_init(); -+ return (*libc_memalign)(alignment, size); -+} -+ -+void MuslFree(const AllocatorDispatch*, void* address, void* context) { -+ if (!libc_free) -+ musl_libc_memory_init(); -+ (*libc_free)(address); -+} -+ -+size_t MuslGetSizeEstimate(const AllocatorDispatch*, void* address, void* context) { -+ // TODO(siggi, primiano): malloc_usable_size may need redirection in the -+ // presence of interposing shims that divert allocations. -+ if (!libc_malloc_usable_size) -+ musl_libc_memory_init(); -+ return (*libc_malloc_usable_size)(address); -+} -+ -+} // namespace -+ -+const AllocatorDispatch AllocatorDispatch::default_dispatch = { -+ &MuslMalloc, /* alloc_function */ -+ &MuslCalloc, /* alloc_zero_initialized_function */ -+ &MuslMemalign, /* alloc_aligned_function */ -+ &MuslRealloc, /* realloc_function */ -+ &MuslFree, /* free_function */ -+ &MuslGetSizeEstimate, /* get_size_estimate_function */ -+ nullptr, /* next */ -+}; -+ -+#endif -- cgit v1.2.1