From 4cfafc65b7697db1c2e74dbb92ecc2351c0417e1 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 3 Oct 2012 00:02:46 +0200 Subject: [PATCH] (Android / JNI) Compiles RetroArch in ARM mode now instead of THUMB - can now use mrc instruction --- android/jni/Android.mk | 2 +- benchmark.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 75844db6f7..040071c51c 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -7,7 +7,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := retroarch LOCAL_SRC_FILES = ../../console/griffin/griffin.c ../../console/rzlib/rzlib.c ../bifrost.c -LOCAL_CFLAGS = -DPERF_TEST -DANDROID -DHAVE_DYNAMIC -DHAVE_DYLIB -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_VID_CONTEXT -DHAVE_ZLIB -DHAVE_RARCH_MAIN_WRAP -DINLINE=inline -DRARCH_CONSOLE -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -std=gnu99 +LOCAL_CFLAGS = -DPERF_TEST -marm -DANDROID -DHAVE_DYNAMIC -DHAVE_DYLIB -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_VID_CONTEXT -DHAVE_ZLIB -DHAVE_RARCH_MAIN_WRAP -DINLINE=inline -DRARCH_CONSOLE -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -std=gnu99 LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -lGLESv2 -llog diff --git a/benchmark.c b/benchmark.c index 9b1ba28882..537a02590e 100644 --- a/benchmark.c +++ b/benchmark.c @@ -45,7 +45,7 @@ rarch_perf_tick_t rarch_get_perf_counter(void) asm volatile ("rdtsc" : "=a" (a), "=d" (d)); time = (rarch_perf_tick_t)a | ((rarch_perf_tick_t)d << 32); #endif -#elif defined(__ARM_ARCH_6__) +#elif defined(__ARM_ARCH_6__) || defined(ANDROID) asm volatile( "mrc p15, 0, %0, c9, c13, 0" : "=r"(time) ); #elif defined(__CELLOS_LV2__) || defined(GEKKO) || defined(_XBOX360) time = __mftb();