diff options
| author | Sebastien Pouliot <sebastien.pouliot@gmail.com> | 2016-12-17 01:43:44 +0300 |
|---|---|---|
| committer | Sebastien Pouliot <sebastien.pouliot@gmail.com> | 2016-12-17 01:43:44 +0300 |
| commit | 33aa393e215e2a36157b71705c75ef46ca611571 (patch) | |
| tree | 2064cde7b0b68badf290b2db728ddf6d7d83f362 | |
| parent | ad18d03a847776b6615b403738b38d82e7938e3e (diff) | |
| parent | cf24b9f9d4b80512122f998a47cae850df1d4cb2 (diff) | |
Merge branch 'mono-4.6.0-branch' into mono-4.6.0-branch-watchos-debuggingmono-4.6.0-branch-watchos-debugging
| -rw-r--r-- | mono/utils/mach-support-arm.c | 2 | ||||
| -rw-r--r-- | mono/utils/mach-support-arm64.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mono/utils/mach-support-arm.c b/mono/utils/mach-support-arm.c index a7fd9836d18..f84cc85b63c 100644 --- a/mono/utils/mach-support-arm.c +++ b/mono/utils/mach-support-arm.c @@ -106,7 +106,7 @@ mono_mach_arch_get_thread_state_size () int mono_mach_arch_get_thread_fpstate_size () { - g_assert_not_reached (); + return sizeof (arm_neon_state_t); } kern_return_t diff --git a/mono/utils/mach-support-arm64.c b/mono/utils/mach-support-arm64.c index 2035f485b14..4a58dc4a218 100644 --- a/mono/utils/mach-support-arm64.c +++ b/mono/utils/mach-support-arm64.c @@ -106,7 +106,7 @@ mono_mach_arch_get_thread_state_size () int mono_mach_arch_get_thread_fpstate_size () { - g_assert_not_reached (); + return sizeof (arm_neon_state64_t); } kern_return_t |