only add the attribute on aarch64, i guess

DynamoRIO · Dec 27, 2024 · e95e36a · e95e36a
1 parent a4c71c2
commit e95e36a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/core/unix/os.c b/core/unix/os.c
@@ -784,7 +784,8 @@ static init_fn_t
 #else
 /* If we're a normal shared object, then we override _init.
  */
-int _init(int argc, char **argv, char **envp)
+INITIALIZER_ATTRIBUTES int
+_init(int argc, char **argv, char **envp)
 {
 #    ifdef ANDROID
     /* i#1862: the Android loader passes *nothing* to lib init routines.  We

diff --git a/core/unix/os_public.h b/core/unix/os_public.h
@@ -242,4 +242,10 @@ typedef kernel_sigcontext_t sigcontext_t;
 #    define SC_RETURN_REG SC_A0
 #endif /* X86/ARM */
 
+#if defined(MACOS) && defined(AARCH64)
+    #define INITIALIZER_ATTRIBUTES __attribute__((constructor))
+#else
+    #define INITIALIZER_ATTRIBUTES
+#endif
+
 #endif /* _OS_PUBLIC_H_ 1 */
diff --git a/core/unix/preload.c b/core/unix/preload.c
@@ -50,6 +50,7 @@
 #include "configure.h"
 #include "globals_shared.h"
 #include "../config.h"
+#include "os_public.h"
 #include <stdio.h>
 /* for getpid */
 #include <unistd.h>
@@ -137,7 +138,7 @@ take_over(const char *pname)
     return true;
 }
 
-int
+INITIALIZER_ATTRIBUTES int
 #if INIT_BEFORE_LIBC
 _init(int argc, char *arg0, ...)
 {