From c5ed0bb5c6dbc8499dc917fde72cf07d5a4176e5 Mon Sep 17 00:00:00 2001
From: Aaron Culliney <devnull@deadc0de.org>
Date: Sat, 20 Feb 2016 13:41:19 -0800
Subject: [PATCH] Switch Android toolchain to stable Clang

---
 Android/jni/build.sh   | 8 ++++----
 Android/jni/sources.mk | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Android/jni/build.sh b/Android/jni/build.sh
index f5f3a006..f2ec396c 100755
--- a/Android/jni/build.sh
+++ b/Android/jni/build.sh
@@ -104,8 +104,8 @@ fi
 
 if test "x$do_build" = "x1" -o "x$do_release" = "x1" ; then
 
-    #CC=`which clang`
-    CC=`which gcc`
+    CC=`which clang`
+    #CC=`which gcc`
     CFLAGS="-std=gnu11"
 
     # ROMz
@@ -122,14 +122,14 @@ if test "x$do_build" = "x1" -o "x$do_release" = "x1" ; then
 
     if test "x$do_build" = "x1" ; then
         export BUILD_MODE=debug
-        ndk-build V=1 NDK_MODULE_PATH=. NDK_DEBUG=1 # NDK_TOOLCHAIN_VERSION=clang
+        ndk-build V=1 NDK_MODULE_PATH=. NDK_DEBUG=1 NDK_TOOLCHAIN_VERSION=clang
         ret=$?
         if test "x$ret" != "x0" ; then
             exit $ret
         fi
     else
         export BUILD_MODE=release
-        ndk-build V=1 NDK_MODULE_PATH=. # NDK_TOOLCHAIN_VERSION=clang
+        ndk-build V=1 NDK_MODULE_PATH=. NDK_TOOLCHAIN_VERSION=clang
         ret=$?
         if test "x$ret" != "x0" ; then
             exit $ret
diff --git a/Android/jni/sources.mk b/Android/jni/sources.mk
index 45bde6e7..e70bae32 100644
--- a/Android/jni/sources.mk
+++ b/Android/jni/sources.mk
@@ -41,7 +41,7 @@ APPLE2_MAIN_SRC = \
 
 APPLE2_OPTIM_CFLAGS := -O2
 APPLE2_BASE_CFLAGS := -DAPPLE2IX=1 -DINTERFACE_TOUCH=1 -DMOBILE_DEVICE=1 -DVIDEO_OPENGL=1 -DDEBUGGER=1 -DAUDIO_ENABLED=1 -std=gnu11 -DPREVENT_TEXTREL=1 -fPIC $(APPLE2_OPTIM_CFLAGS) -I$(APPLE2_SRC_PATH)
-APPLE2_BASE_LDLIBS := -llog -landroid -lGLESv2 -lz -lOpenSLES
+APPLE2_BASE_LDLIBS := -llog -landroid -lGLESv2 -lz -lOpenSLES -latomic
 
 LOCAL_WHOLE_STATIC_LIBRARIES += cpufeatures