Merge pull request #175 from hkr/unity-4.5-staging

Cherry-picked update of Android toolchain and memory barrier implementation for Unity 4.x

external/buildscripts/build_runtime_android.sh

@@ -3,15 +3,15 @@
 # NB! Prereq : ANDROID_NDK_ROOT=/usr/local/android-ndk-xxx or similar
 # Todo: set appropriate ARM flags for hard floats
 
-export ANDROID_PLATFORM=android-5
+export ANDROID_PLATFORM=android-9
 GCC_PREFIX=arm-linux-androideabi-
-GCC_VERSION=4.4.3
+GCC_VERSION=4.8
 OUTDIR=builds/embedruntimes/android
 CWD="$(pwd)"
 PREFIX="$CWD/builds/android"
 BUILDSCRIPTSDIR=external/buildscripts
 
-perl ${BUILDSCRIPTSDIR}/PrepareAndroidSDK.pl -ndk=r8e -env=envsetup.sh && source envsetup.sh
+perl ${BUILDSCRIPTSDIR}/PrepareAndroidSDK.pl -ndk=r9 -env=envsetup.sh && source envsetup.sh
 
 NDK_ROOT=`cd $ANDROID_NDK_ROOT && pwd`
 

external/buildscripts/build_runtime_android_x86.sh

@@ -5,7 +5,7 @@
 
 export ANDROID_PLATFORM=android-9
 GCC_PREFIX=i686-linux-android-
-GCC_VERSION=4.4.3
+GCC_VERSION=4.8
 OUTDIR=builds/embedruntimes/android
 PREFIX=`pwd`/builds/android
 

libgc/include/private/gc_locks.h

@@ -247,7 +247,7 @@
       inline static void GC_clear(volatile unsigned int *addr) {
 #ifdef HAVE_ARMV6
 		  /* Memory barrier */
-		  __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r" (0) : "memory");
+		  __sync_synchronize();
 #endif
 		  *(addr) = 0;
       }