From a93f9ef8f80f0ad6ccf5d09c9e01fe0756e88442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 14 May 2020 12:12:56 +0200 Subject: [PATCH] Fix mono runtime build warnings when building iOS config (#36435) ``` /Users/alexander/dev/runtime/src/mono/mono/mini/aot-runtime.c:5647:13: warning: unused variable 'image' [-Wunused-variable] /Users/alexander/dev/runtime/src/mono/mono/mini/simd-intrinsics-netcore.c:11:1: warning: no previous prototype for function 'mono_simd_intrinsics_init' [-Wmissing-prototypes] /Users/alexander/dev/runtime/src/mono/mono/utils/mono-state.c:1230:1: warning: no previous prototype for function 'mono_crash_save_failfast_msg' [-Wmissing-prototypes] /Users/alexander/dev/runtime/src/mono/mono/utils/mono-state.c:1236:1: warning: no previous prototype for function 'mono_crash_get_failfast_msg' [-Wmissing-prototypes] ``` --- src/mono/mono/mini/aot-runtime.c | 1 - src/mono/mono/mini/simd-intrinsics-netcore.c | 2 +- src/mono/mono/utils/mono-state.c | 32 ++++++++++---------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/mono/mono/mini/aot-runtime.c b/src/mono/mono/mini/aot-runtime.c index 1c04902fcc8d2..cd7ff7bc4c8fb 100644 --- a/src/mono/mono/mini/aot-runtime.c +++ b/src/mono/mono/mini/aot-runtime.c @@ -5644,7 +5644,6 @@ read_page_trampoline_uwinfo (MonoTrampInfo *info, int tramp_type, gboolean is_ge static unsigned char* get_new_trampoline_from_page (int tramp_type) { - MonoImage *image; TrampolinePage *page; int count; void *tpage; diff --git a/src/mono/mono/mini/simd-intrinsics-netcore.c b/src/mono/mono/mini/simd-intrinsics-netcore.c index ea4c1a9574c02..50f904bcd0fee 100644 --- a/src/mono/mono/mini/simd-intrinsics-netcore.c +++ b/src/mono/mono/mini/simd-intrinsics-netcore.c @@ -4,6 +4,7 @@ #include #include +#include "mini.h" #if defined(DISABLE_JIT) @@ -18,7 +19,6 @@ mono_simd_intrinsics_init (void) * Only LLVM is supported as a backend. */ -#include "mini.h" #include "mini-runtime.h" #include "ir-emit.h" #ifdef ENABLE_LLVM diff --git a/src/mono/mono/utils/mono-state.c b/src/mono/mono/utils/mono-state.c index 717c88cfb07a9..7333818f3a2a7 100644 --- a/src/mono/mono/utils/mono-state.c +++ b/src/mono/mono/utils/mono-state.c @@ -1202,22 +1202,6 @@ mono_crash_dump (const char *jsonFile, MonoStackHash *hashes) return; } -#endif // DISABLE_CRASH_REPORTING - -static volatile int32_t dump_status; - -gboolean -mono_dump_start (void) -{ - return (mono_atomic_xchg_i32(&dump_status, 1) == 0); // return true if we started the dump -} - -gboolean -mono_dump_complete (void) -{ - return (mono_atomic_xchg_i32(&dump_status, 0) == 1); // return true if we completed the dump -} - static char *saved_failfast_msg; /** @@ -1237,3 +1221,19 @@ mono_crash_get_failfast_msg (void) { return saved_failfast_msg; } + +#endif // DISABLE_CRASH_REPORTING + +static volatile int32_t dump_status; + +gboolean +mono_dump_start (void) +{ + return (mono_atomic_xchg_i32(&dump_status, 1) == 0); // return true if we started the dump +} + +gboolean +mono_dump_complete (void) +{ + return (mono_atomic_xchg_i32(&dump_status, 0) == 1); // return true if we completed the dump +}