diff options
| author | Tor Lillqvist <tml@collabora.com> | 2020-04-29 20:12:21 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-11-15 08:41:37 +0100 |
| commit | 1a4f7443491e809959b53838fb0cfad287317a88 (patch) | |
| tree | 3d88f8403f006c4cbcabb91751314bc568b8e43e | |
| parent | cef33044bcc72181824f32aaa84555447629852d (diff) | |
Use MAP_JIT on macOS
See https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_security_cs_disable-executable-page-protection
and https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_security_cs_allow-jit
Change-Id: I192038efa9cff4fb723bf4bdc8644f0b09f0fcda
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93181
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105847
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
| -rw-r--r-- | bridges/source/cpp_uno/shared/vtablefactory.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx index 70187cbd2fe7..d17533534e9b 100644 --- a/bridges/source/cpp_uno/shared/vtablefactory.cxx +++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx @@ -77,6 +77,11 @@ extern "C" void * allocExec( std::size_t n = (*size + (pagesize - 1)) & ~(pagesize - 1); void * p; #if defined SAL_UNX +#if defined MACOSX + p = mmap( + nullptr, n, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANON | MAP_JIT, -1, + 0); +#else p = mmap( nullptr, n, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); @@ -88,6 +93,7 @@ extern "C" void * allocExec( munmap (p, n); p = nullptr; } +#endif #elif defined _WIN32 p = VirtualAlloc(nullptr, n, MEM_COMMIT, PAGE_EXECUTE_READWRITE); #endif |