v1

Author: zhengyu123

ddprof-lib/build.gradle

@@ -3,6 +3,7 @@ plugins {
   id 'java'
   id 'maven-publish'
   id 'signing'
+  id 'assembler'
 
   id 'com.github.ben-manes.versions' version '0.27.0'
   id 'de.undercouch.download' version '4.1.1'
@@ -606,7 +607,22 @@ tasks.register('javadocJar', Jar) {
 }
 
 tasks.register('asmTask', Exec) {
-  commandLine 'clang', '-D__aarch64__', 'src/main/asm/safefetch.S', '-o', 'build/obj/safefetch.o'
+  String reportedArch = System.getProperty('os.arch')
+  String arch
+  if (reportedArch == 'x86_64') {
+    arch = '-D__x86_64__'
+  } else {
+    arch = '-D__aarch64__'
+  }
+
+  String os
+  if (osIdentifier() == 'macos') {
+    os = '-D__APPLE__'
+  } else {
+    os = '-D__LINUX__'
+  }
+
+  commandLine 'gcc', arch, os, 'src/main/assembler/safefetch.S', '-c', 'build/obj/safefetch.o'
 }
 
 tasks.register('scanBuild', Exec) {

ddprof-lib/src/main/asm/safefetch.S ddprof-lib/src/main/assembler/safefetch.Sddprof-lib/src/main/asm/safefetch.S renamed to ddprof-lib/src/main/assembler/safefetch.S

@@ -1,9 +1,20 @@
+#ifdef __APPLE__
+  # macOS prefixes symbols with _
+  #define SYMBOL(s) _ ## s
+
+  #define DECLARE_FUNC(func) \
+    .globl SYMBOL(func) %% \
+    .private_extern SYMBOL(func) %% \
+    SYMBOL(func)
+#else
+  #define SYMBOL(s) s
 
-#define DECLARE_FUNC(func) \
-    .globl func %% \
-    .hidden func %% \
-    .type func, %function %% \
+  #define DECLARE_FUNC(func) \
+    .globl func ; \
+    .hidden func ; \
+    .type func, %function ; \
     func
+#endif // __APPLE__
 
 #if defined(__x86_64__)
     .text