lib: fix error on MacOS

Sections use a different syntax for Mach-O executables.

Fixes:

lib/bfd.c:35:1: error: argument to 'section' attribute is not valid for this target: mach-o section specifier requires a segment and section separated by a
      comma
DEFINE_MTYPE_STATIC(LIB, BFD_INFO, "BFD info")
^
./lib/memory.h:140:2: note: expanded from macro 'DEFINE_MTYPE_STATIC'
        DEFINE_MTYPE_ATTR(group, name, static, desc)                           \
        ^
./lib/memory.h:110:26: note: expanded from macro 'DEFINE_MTYPE_ATTR'
                __attribute__((section(".data.mtypes"))) = { {                 \
                                       ^
1 error generated.

Signed-off-by: Ruben Kerkhof <ruben@rubenkerkhof.com>
Signed-off-by: Georgi Valkov <gvalkov@gmail.com>

diff --git a/lib/compiler.h b/lib/compiler.h
index 03261052a22d4efc38311d4e51013d9ccd3bdfbc..9d39026c667596cecc165721b60df662f06e8391 100644 (file)
--- a/lib/compiler.h
+++ b/lib/compiler.h
@@ -455,6 +455,12 @@ _Static_assert(sizeof(_uint64_t) == 8 && sizeof(_int64_t) == 8,
 #define unlikely(_x) !!(_x)
 #endif
 
+#ifdef __MACH__
+#define _DATA_SECTION(name) __attribute__((section("__DATA," name)))
+#else
+#define _DATA_SECTION(name) __attribute__((section(".data." name)))
+#endif
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/memory.h b/lib/memory.h
index ba437ebd0ed92ffe422ae278cb1fc4539e9a87db..65b99a5fc945a98901f63b0a1a61561d25b9e81c 100644 (file)
--- a/lib/memory.h
+++ b/lib/memory.h
@@ -69,14 +69,12 @@ struct memgroup {
 
 #define DECLARE_MGROUP(name) extern struct memgroup _mg_##name
 #define _DEFINE_MGROUP(mname, desc, ...)                                       \
-       struct memgroup _mg_##mname                                            \
-               __attribute__((section(".data.mgroups"))) = {                  \
-                       .name = desc,                                          \
-                       .types = NULL,                                         \
-                       .next = NULL,                                          \
-                       .insert = NULL,                                        \
-                       .ref = NULL,                                           \
-                       __VA_ARGS__                                            \
+       struct memgroup _mg_##mname _DATA_SECTION("mgroups") = {               \
+               .name = desc,                                                  \
+               .types = NULL,                                                 \
+               .next = NULL,                                                  \
+               .insert = NULL,                                                \
+               .ref = NULL,                                                   \
        };                                                                     \
        static void _mginit_##mname(void) __attribute__((_CONSTRUCTOR(1000))); \
        static void _mginit_##mname(void)                                      \
@@ -105,13 +103,12 @@ struct memgroup {
        /* end */
 
 #define DEFINE_MTYPE_ATTR(group, mname, attr, desc)                            \
-       attr struct memtype MTYPE_##mname[1]                                   \
-               __attribute__((section(".data.mtypes"))) = { {                 \
-                       .name = desc,                                          \
-                       .next = NULL,                                          \
-                       .n_alloc = 0,                                          \
-                       .size = 0,                                             \
-                       .ref = NULL,                                           \
+       attr struct memtype MTYPE_##mname[1] _DATA_SECTION("mtypes") = { {     \
+               .name = desc,                                                  \
+               .next = NULL,                                                  \
+               .n_alloc = 0,                                                  \
+               .size = 0,                                                     \
+               .ref = NULL,                                                   \
        } };                                                                   \
        static void _mtinit_##mname(void) __attribute__((_CONSTRUCTOR(1001))); \
        static void _mtinit_##mname(void)                                      \