Skip to content

Commit c2401ef

Browse files
authored
Merge pull request #781 from Unity-Technologies/unity-master-fix-android-gc (case 954427)
Always set GC_no_dls when using bdwgc. This fixes a segfault when using our newer Boehm GC on android
2 parents 3492bb2 + f785be4 commit c2401ef

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

mono/metadata/boehm-gc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ mono_gc_base_init (void)
180180
default_push_other_roots = GC_push_other_roots;
181181
GC_push_other_roots = mono_push_other_roots;
182182

183-
#if !defined(HOST_ANDROID)
184-
/* If GC_no_dls is set to true, GC_find_limit is not called. This causes a seg fault on Android. */
183+
#if defined(HAVE_BDWGC_GC) || !defined(HOST_ANDROID)
184+
/* If GC_no_dls is set to true, GC_find_limit is not called. This causes a seg fault on Android With Mono's Older Boehm. */
185185
GC_no_dls = TRUE;
186186
#endif
187187
{

0 commit comments

Comments
 (0)