From: Ivan Maidanski <ivmai@mail.ru>
Date: Tue, 4 Nov 2014 08:14:24 +0000 (+0300)
Subject: Merge remote-tracking branch 'robovm/thread_get_state_stack_corruption_on_ios7_64bit_... 
X-Git-Tag: gc7_6_0~205^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d362bacdb0800ab894a73e437ab92370429a014;p=platform%2Fupstream%2Flibgc.git

Merge remote-tracking branch 'robovm/thread_get_state_stack_corruption_on_ios7_64bit_and_ios8'

Conflicts:
	darwin_stop_world.c
---

7d362bacdb0800ab894a73e437ab92370429a014
diff --cc darwin_stop_world.c
index a8c5e95,690f0ea..5754899
--- a/darwin_stop_world.c
+++ b/darwin_stop_world.c
@@@ -21,9 -25,6 +21,10 @@@
  
  #if defined(GC_DARWIN_THREADS)
  
 +#include <sys/sysctl.h>
 +#include <mach/machine.h>
++#include <CoreFoundation/CoreFoundation.h>
 +
  /* From "Inside Mac OS X - Mach-O Runtime Architecture" published by Apple
     Page 49:
     "The space beneath the stack pointer, where a new stack frame would normally