From 8ed470fcf9b3037dc1459d102683e43d2a9acaec Mon Sep 17 00:00:00 2001 From: Alfonso Gregory Date: Fri, 16 Jul 2021 09:59:30 -0400 Subject: [PATCH 1/3] Remove old hack MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s been a long time since snow leopard and the issue should be fixed by now --- src/mono/mono/mini/mini-darwin.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/mono/mono/mini/mini-darwin.c b/src/mono/mono/mini/mini-darwin.c index 99a389d70c36f2..e137165ff9799e 100644 --- a/src/mono/mono/mini/mini-darwin.c +++ b/src/mono/mono/mini/mini-darwin.c @@ -98,21 +98,6 @@ mono_runtime_install_handlers (void) if (kr != KERN_SUCCESS) g_warning ("mono_runtime_install_handlers: task_set_exception_ports failed"); #endif - - /* Snow Leopard has a horrible bug: http://openradar.appspot.com/7209349 - * This causes obscure SIGTRAP's for any application that comes across this built on - * Snow Leopard. This is a horrible hack to ensure that the private __CFInitialize - * is run on the main thread, so that we don't get SIGTRAPs later - */ -#if defined (__APPLE__) && (defined (__i386__) || defined (__x86_64__)) - { - void *handle = dlopen ("/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation", RTLD_LAZY); - if (handle == NULL) - return; - - dlclose (handle); - } -#endif } gboolean From d7c9120e87098ecd1c8113aef58254fc1a206189 Mon Sep 17 00:00:00 2001 From: Alfonso Gregory Date: Fri, 16 Jul 2021 10:01:36 -0400 Subject: [PATCH 2/3] Remove declaration --- src/mono/mono/mini/mini-darwin.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/mono/mono/mini/mini-darwin.c b/src/mono/mono/mini/mini-darwin.c index e137165ff9799e..03e4e4ec612a18 100644 --- a/src/mono/mono/mini/mini-darwin.c +++ b/src/mono/mono/mini/mini-darwin.c @@ -66,11 +66,6 @@ #include #include -/* This is #define'd by Boehm GC to _GC_dlopen. */ -#undef dlopen - -void* dlopen(const char* path, int mode); - void mono_runtime_install_handlers (void) { From adb0553e4418004f839f4bf556dc35325ad4b451 Mon Sep 17 00:00:00 2001 From: Alfonso Gregory Date: Fri, 16 Jul 2021 13:09:41 -0400 Subject: [PATCH 3/3] Remove unnecessary include --- src/mono/mono/mini/mini-darwin.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mono/mono/mini/mini-darwin.c b/src/mono/mono/mini/mini-darwin.c index 03e4e4ec612a18..981c9195d1d256 100644 --- a/src/mono/mono/mini/mini-darwin.c +++ b/src/mono/mono/mini/mini-darwin.c @@ -63,7 +63,6 @@ #include #include #include -#include #include void