Fix the assembler gradle task

jbachorik · jbachorik · commit ce5081e0afc2 · 2025-07-16T11:54:18.000+02:00
diff --git a/ddprof-lib/build.gradle b/ddprof-lib/build.gradle
@@ -516,14 +516,18 @@ tasks.whenTaskAdded { task ->
             onlyIf {
               config.active
             }
+
             group = 'build'
             description = "Link the ${config.name} build of the library"
             source = fileTree("$buildDir/obj/main/${config.name}")
+            source.from(file("${projectDir}/build/obj/main/asm/assembly.o"))
+
             linkedFile = file("$buildDir/lib/main/${config.name}/${osIdentifier()}/${archIdentifier()}/libjavaProfiler.${os().isLinux() ? 'so' : 'dylib'}")
             def compileTask = tasks.findByName("compileLib${config.name.capitalize()}".toString())
             if (compileTask != null) {
               dependsOn compileTask
             }
+            def asmTask = tasks.findByName("asm")
             dependsOn asmTask
             linkerArgs.addAll(config.linkerArgs)
             toolChain = task.toolChain
@@ -605,22 +609,43 @@ tasks.register('javadocJar', Jar) {
   from javadoc.destinationDir
 }
 
-tasks.register('asmTask', Exec) {
-  String reportedArch = System.getProperty('os.arch')
-  String arch
-  if (reportedArch == 'x86_64') {
+tasks.register('asm', Exec) {
+  group = 'build'
+
+  def arch
+  if (archIdentifier() == 'x64') {
     arch = '-D__x86_64__'
   } else {
     arch = '-D__aarch64__'
   }
 
-  String os
+  def os
   if (osIdentifier() == 'macos') {
     os = '-D__APPLE__'
   } else {
     os = '-D__LINUX__'
   }
-  commandLine 'gcc', arch, os, 'src/main/assembler/safefetch.S', '-c', 'safefetch.o'
+  def asmDir = file("${projectDir}/src/main/assembler")
+  if (!asmDir.exists()) {
+    // no assembler files found, skipping
+    return;
+  }
+
+  doLast {
+    // Ensure the output directory exists
+    file("${projectDir}/build/obj/main/asm").mkdirs()
+  }
+
+  // collect all assembler files and compile them
+  workingDir asmDir
+  inputs.files fileTree("${projectDir}/src/main/assembler") {
+    include '**/*.S'
+  }
+  def asmFiles = inputs.files.collect { it.absolutePath }
+  outputs.dir "${projectDir}/build/obj/main/asm"
+  // use gcc to compile assembler files
+  commandLine 'gcc', arch, os, '-c', '-x', 'assembler-with-cpp',
+              *asmFiles, '-o', "${projectDir}/build/obj/main/asm/assembly.o"
 }
 
 tasks.register('scanBuild', Exec) {
diff --git a/ddprof-lib/gtest/build.gradle b/ddprof-lib/gtest/build.gradle
@@ -154,7 +154,10 @@ tasks.whenTaskAdded { task ->
             group = 'verification'
             description = "Run all Google Tests for the ${config.name} build of the library"
           }
-          project(':ddprof-lib').file("src/test/cpp/").eachFile {
+          def libProject = project(':ddprof-lib')
+          def asmTask = libProject.tasks.findByName("asm")
+
+          libProject.file("src/test/cpp/").eachFile {
 
             def testFile = it
             def testName = it.name.substring(0, it.name.lastIndexOf('.'))
@@ -167,6 +170,7 @@ tasks.whenTaskAdded { task ->
               group = 'build'
               description = "Link the Google Test for the ${config.name} build of the library"
               source = fileTree("$buildDir/obj/gtest/${config.name}/${testName}")
+              source.from(file("${rootDir}/ddprof-lib/build/obj/main/asm/assembly.o"))
               linkedFile = binary
               if (config.name != 'release') {
                 // linking the gtests using the minimizing release flags is making gtest unhappy
@@ -183,6 +187,7 @@ tasks.whenTaskAdded { task ->
               libs = task.libs
               inputs.files source
               outputs.file linkedFile
+              dependsOn asmTask
             }
             def gtestExecuteTask = tasks.register("gtest${config.name.capitalize()}_${testName}", Exec) {
               onlyIf {
