#921: Fix compilation failure on ARM32

async-profiler · May 3, 2024 · 07e6015 · 07e6015
1 parent 26a94a1
commit 07e6015
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/incbin.h b/src/incbin.h
@@ -10,7 +10,7 @@
 #  define INCBIN_SECTION ".const_data"
 #  define INCBIN_SYMBOL  "_"
 #else
-#  define INCBIN_SECTION ".section \".rodata\", \"a\", @progbits"
+#  define INCBIN_SECTION ".section \".rodata\", \"a\""
 #  define INCBIN_SYMBOL
 #endif
 

diff --git a/src/profiler.h b/src/profiler.h
@@ -183,7 +183,7 @@ class Profiler {
     }
 
     u64 total_samples() { return _total_samples; }
-    time_t uptime()     { return time(NULL) - _start_time; }
+    long uptime()       { return time(NULL) - _start_time; }
 
     Dictionary* classMap() { return &_class_map; }
     ThreadFilter* threadFilter() { return &_thread_filter; }

diff --git a/src/vmEntry.cpp b/src/vmEntry.cpp
@@ -72,7 +72,8 @@ static void* resolveMethodId(void** mid) {
     return mid == NULL || *mid < (void*)4096 ? NULL : *mid;
 }
 
-static void resolveMethodIdEnd() {
+static void* resolveMethodIdEnd() {
+    return NULL;
 }