Skip to content

Fix mono runtime build warnings when building iOS config #36435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akoeplinger merged 1 commit into from
May 14, 2020
Merged

Fix mono runtime build warnings when building iOS config #36435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/mono/mono/mini/aot-runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/mini/simd-intrinsics-netcore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include <config.h>
#include <mono/utils/mono-compiler.h>
#include "mini.h"

#if defined(DISABLE_JIT)

Expand All @@ -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
Expand Down
32 changes: 16 additions & 16 deletions src/mono/mono/utils/mono-state.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -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
}