Add __attribute__((constructor)) to macos builds for _init

DynamoRIO · Dec 27, 2024 · c5a1cef · c5a1cef
1 parent b403254
commit c5a1cef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/core/unix/os.c b/core/unix/os.c
@@ -784,7 +784,7 @@ static init_fn_t
 #else
 /* If we're a normal shared object, then we override _init.
  */
-int
+IF_MACOS(__attribute__((constructor))) int
 _init(int argc, char **argv, char **envp)
 {
 #    ifdef ANDROID
@@ -1143,6 +1143,7 @@ get_application_name_helper(bool ignore_cache, bool full_path)
 #else
             /* OSX kernel puts full app exec path above envp */
             char *c, **env = our_environ;
+            ASSERT(our_environ != NULL && "our_environ is not set in get_application_name_helper");
             do {
                 env++;
             } while (*env != NULL);

diff --git a/core/unix/preload.c b/core/unix/preload.c
@@ -137,7 +137,7 @@ take_over(const char *pname)
     return true;
 }
 
-__attribute__((constructor)) int
+IF_MACOS(__attribute__((constructor))) int
 #if INIT_BEFORE_LIBC
 _init(int argc, char *arg0, ...)
 {