From a6f5622a0ad4a89ac08d48740d0da550de30bb43 Mon Sep 17 00:00:00 2001 From: vsadov Date: Sat, 11 Jul 2020 08:40:52 -0700 Subject: [PATCH 1/2] enable GS Cookie on OSX --- src/coreclr/src/vm/ceemain.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/coreclr/src/vm/ceemain.cpp b/src/coreclr/src/vm/ceemain.cpp index 0401160ab17b2d..5c763f86039db1 100644 --- a/src/coreclr/src/vm/ceemain.cpp +++ b/src/coreclr/src/vm/ceemain.cpp @@ -484,13 +484,6 @@ void InitGSCookie() } CONTRACTL_END; -#if defined(TARGET_OSX) && defined(CORECLR_EMBEDDED) - // OSX does not like the way we change section protection when running in a superhost bundle - // disabling this for now - // https://github.com/dotnet/runtime/issues/38184 - return; -#endif - volatile GSCookie * pGSCookiePtr = GetProcessGSCookiePtr(); #ifdef TARGET_UNIX From 15fa0eb3ad01ac2ca8007c7db5296daba1b037ba Mon Sep 17 00:00:00 2001 From: vsadov Date: Sat, 11 Jul 2020 10:11:07 -0700 Subject: [PATCH 2/2] Actual fix --- src/coreclr/src/vm/vars.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/src/vm/vars.hpp b/src/coreclr/src/vm/vars.hpp index 57ac31a285ca80..ccf9289abab04b 100644 --- a/src/coreclr/src/vm/vars.hpp +++ b/src/coreclr/src/vm/vars.hpp @@ -694,7 +694,7 @@ typedef DPTR(GSCookie) PTR_GSCookie; #define READONLY_ATTR #else #ifdef __APPLE__ -#define READONLY_ATTR_ARGS section("__TEXT,__const") +#define READONLY_ATTR_ARGS section("__DATA,__const") #else #define READONLY_ATTR_ARGS section(".rodata") #endif