diff options
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/masm/assembler/ARMv7Assembler.h | 6 | ||||
-rw-r--r-- | src/3rdparty/masm/masm.pri | 5 | ||||
-rw-r--r-- | src/3rdparty/masm/wtf/OSAllocatorPosix.cpp | 14 | ||||
-rw-r--r-- | src/3rdparty/masm/wtf/Platform.h | 5 |
4 files changed, 12 insertions, 18 deletions
diff --git a/src/3rdparty/masm/assembler/ARMv7Assembler.h b/src/3rdparty/masm/assembler/ARMv7Assembler.h index f2e8dc1a1b..03cb9f42f8 100644 --- a/src/3rdparty/masm/assembler/ARMv7Assembler.h +++ b/src/3rdparty/masm/assembler/ARMv7Assembler.h @@ -40,6 +40,10 @@ #include <libkern/OSCacheControl.h> #endif +#if OS(RTEMS) +#include <rtems/rtems/cache.h> +#endif + namespace JSC { namespace ARMRegisters { @@ -2359,6 +2363,8 @@ public: #elif OS(QNX) #if !ENABLE(ASSEMBLER_WX_EXCLUSIVE) msync(code, size, MS_INVALIDATE_ICACHE); +#elif OS(RTEMS) + rtems_cache_flush_multiple_data_lines(code, size); #else UNUSED_PARAM(code); UNUSED_PARAM(size); 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) { diff --git a/src/3rdparty/masm/wtf/Platform.h b/src/3rdparty/masm/wtf/Platform.h index bd66af7fe6..ab1da2198a 100644 --- a/src/3rdparty/masm/wtf/Platform.h +++ b/src/3rdparty/masm/wtf/Platform.h @@ -438,6 +438,10 @@ #define WTF_OS_WINDOWS 1 #endif +#ifdef __rtems__ +#define WTF_OS_RTEMS 1 +#endif + #define WTF_OS_WIN ERROR "USE WINDOWS WITH OS NOT WIN" #define WTF_OS_MAC ERROR "USE MAC_OS_X WITH OS NOT MAC" @@ -451,6 +455,7 @@ || OS(NETBSD) \ || OS(OPENBSD) \ || OS(QNX) \ + || OS(RTEMS) \ || OS(SOLARIS) \ || defined(unix) \ || defined(__unix) \ |