From 07e6015d1da21e65deda6ae349e7a40afca08bb5 Mon Sep 17 00:00:00 2001 From: Andrei Pangin Date: Fri, 3 May 2024 03:08:46 +0300 Subject: [PATCH] #921: Fix compilation failure on ARM32 --- src/incbin.h | 2 +- src/profiler.h | 2 +- src/vmEntry.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/incbin.h b/src/incbin.h index 3848612e..4d647d6d 100644 --- 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 index cf639001..f07edcf4 100644 --- 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 index 52830187..907390a8 100644 --- 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; }