diff options
| author | Tasuku Suzuki <tasuku.suzuki@qbc.io> | 2019-07-05 10:10:04 +0900 |
|---|---|---|
| committer | Tasuku Suzuki <tasuku.suzuki@qbc.io> | 2019-07-08 16:43:39 +0900 |
| commit | ef8a27544ac47b0ec2fc8c058d32c5b22650b359 (patch) | |
| tree | 50c44d6874b6aa0f7e1d7fb4572fab4839fdd02a /src/3rdparty | |
| parent | c2916f627373ae79bfe1407d1b7c2b41d06989eb (diff) | |
Remove dladdr usage from masm
string literal "QtQml" is entirely enough for the name here
Change-Id: I62c43f3535998e358d7012b5a455f4e01bb3f1a0
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/masm.pri | 5 | ||||
| -rw-r--r-- | src/3rdparty/masm/wtf/OSAllocatorPosix.cpp | 14 |
2 files changed, 1 insertions, 18 deletions
diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri index 4d15abcba0..1df4585aae 100644 --- a/src/3rdparty/masm/masm.pri +++ b/src/3rdparty/masm/masm.pri @@ -126,8 +126,3 @@ QMAKE_EXTRA_COMPILERS += retgen } } } - -linux { - requires(qtConfig(dlopen)) - QMAKE_USE_PRIVATE += libdl -} diff --git a/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp b/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp index 3b2a73a39a..d59fdcd675 100644 --- a/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp +++ b/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp @@ -74,21 +74,9 @@ static int memfdForUsage(size_t bytes, OSAllocator::Usage usage) break; } - // try to get our own library name by giving dladdr a pointer pointing to - // something we know to be in it (using a pointer to string data) - static const char *libname = [=]() { - Dl_info info; - if (dladdr(type, &info) == 0) - info.dli_fname = nullptr; - return info.dli_fname; - }(); - char buf[PATH_MAX]; strcpy(buf, type); - if (libname) - strcat(buf, libname); - else - strcat(buf, "QtQml"); + strcat(buf, "QtQml"); int fd = syscall(SYS_memfd_create, buf, MFD_CLOEXEC); if (fd != -1) { |