From: Ivan Maidanski <ivmai@mail.ru>
Date: Mon, 30 Jul 2018 07:59:56 +0000 (+0300)
Subject: Define DYNAMIC_LOADING for Darwin unless IGNORE_DYNAMIC_LOADING
X-Git-Tag: v8.0.0~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7fc7a451bba2e1ff9885cbef97695ac26562b84;p=gc

Define DYNAMIC_LOADING for Darwin unless IGNORE_DYNAMIC_LOADING

DYNAMIC_LOADING macro is now controlled by
configure --disable-dynamic-loading option.

* include/private/gcconfig.h [DARWIN && (I386 || AARCH64 || ARM32
|| X86_64)] (DYNAMIC_LOADING): Define even if
GC_DONT_REGISTER_MAIN_STATIC_DATA.
---

diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
index d67255b7..1b50efa0 100644
--- a/include/private/gcconfig.h
+++ b/include/private/gcconfig.h
@@ -1680,9 +1680,7 @@ EXTERN_C_BEGIN
 #   ifdef DARWIN
 #     define OS_TYPE "DARWIN"
 #     define DARWIN_DONT_PARSE_STACK
-#     ifndef GC_DONT_REGISTER_MAIN_STATIC_DATA
-#       define DYNAMIC_LOADING
-#     endif
+#     define DYNAMIC_LOADING
       /* XXX: see get_end(3), get_etext() and get_end() should not be used. */
       /* These aren't used when dyld support is enabled (it is by default). */
 #     define DATASTART ((ptr_t)get_etext())
@@ -2264,9 +2262,7 @@ EXTERN_C_BEGIN
       /* iOS */
 #     define OS_TYPE "DARWIN"
 #     define DARWIN_DONT_PARSE_STACK
-#     ifndef GC_DONT_REGISTER_MAIN_STATIC_DATA
-#       define DYNAMIC_LOADING
-#     endif
+#     define DYNAMIC_LOADING
 #     define DATASTART ((ptr_t)get_etext())
 #     define DATAEND   ((ptr_t)get_end())
 #     define STACKBOTTOM ((ptr_t)0x16fdfffff)
@@ -2397,9 +2393,7 @@ EXTERN_C_BEGIN
       /* iOS */
 #     define OS_TYPE "DARWIN"
 #     define DARWIN_DONT_PARSE_STACK
-#     ifndef GC_DONT_REGISTER_MAIN_STATIC_DATA
-#       define DYNAMIC_LOADING
-#     endif
+#     define DYNAMIC_LOADING
 #     define DATASTART ((ptr_t)get_etext())
 #     define DATAEND   ((ptr_t)get_end())
 #     define STACKBOTTOM ((ptr_t)0x30000000)
@@ -2634,9 +2628,7 @@ EXTERN_C_BEGIN
 #   ifdef DARWIN
 #     define OS_TYPE "DARWIN"
 #     define DARWIN_DONT_PARSE_STACK
-#     ifndef GC_DONT_REGISTER_MAIN_STATIC_DATA
-#       define DYNAMIC_LOADING
-#     endif
+#     define DYNAMIC_LOADING
       /* XXX: see get_end(3), get_etext() and get_end() should not be used. */
       /* These aren't used when dyld support is enabled (it is by default)  */
 #     define DATASTART ((ptr_t)get_etext())