diff --git a/Makefile b/Makefile
index e72919a..a7df1eb 100644
--- a/Makefile
+++ b/Makefile
@@ -238,10 +238,11 @@ else ifneq (,$(findstring armv,$(platform)))
 	CXX = g++
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
-	LDFLAGS += -shared -Wl,--version-script=$(LIBRETRO_DIR)/link.T -Wl,--no-undefined
+	LDFLAGS += -shared -static-libgcc -static-libstdc++
 	INCFLAGS += -I.
 	CPUFLAGS += -DNO_ASM
 	WITH_DYNAREC=arm
+	PLATFORM_EXT := unix
 	ifneq (,$(findstring gles,$(platform)))
 		GLES := 1
 		GL_LIB := -lGLESv2
@@ -249,9 +250,13 @@ else ifneq (,$(findstring armv,$(platform)))
 		GL_LIB := -lGL
 	endif
 	ifneq (,$(findstring cortexa8,$(platform)))
-		CPUFLAGS += -marm -mcpu=cortex-a8
+		CPUFLAGS += -marm -mcpu=cortex-a8 -mtune=cortex-a8
 	else ifneq (,$(findstring cortexa9,$(platform)))
-		CPUFLAGS += -marm -mcpu=cortex-a9
+		CPUFLAGS += -marm -mcpu=cortex-a9 -mtune=cortex-a9
+	else ifneq (,$(findstring cortexa15,$(platform)))
+		CPUFLAGS += -marm -mcpu=cortex-a15 -mtune=cortex-a15
+	else ifneq (,$(findstring cortexa5,$(platform)))
+		CPUFLAGS += -marm -mcpu=cortex-a5 -mtune=cortex-a5
 	endif
 	CPUFLAGS += -marm
 	ifneq (,$(findstring neon,$(platform)))
@@ -263,7 +268,7 @@ else ifneq (,$(findstring armv,$(platform)))
 	else ifneq (,$(findstring hardfloat,$(platform)))
 		CPUFLAGS += -mfloat-abi=hard
 	endif
-	PLATCFLAGS += -DARM
+	PLATCFLAGS += -DARM -DARM_ASM -DNOSSE -DNO_ASM -D__arm__ -D__ARM_NEON__ -D__NEON_OPT -funroll-loops -ffast-math
 
 # emscripten
 else ifeq ($(platform), emscripten)
diff --git a/mupen64plus-core/src/plugin/audio_libretro/audio_resampler_driver.c b/mupen64plus-core/src/plugin/audio_libretro/audio_resampler_driver.c
index 2591e9e..95676ff 100644
--- a/mupen64plus-core/src/plugin/audio_libretro/audio_resampler_driver.c
+++ b/mupen64plus-core/src/plugin/audio_libretro/audio_resampler_driver.c
@@ -22,7 +22,7 @@
 #include "api/msvc_compat.h"
 
 static const rarch_resampler_t *resampler_drivers[] = {
-   &CC_resampler,
+   //&CC_resampler,
    &sinc_resampler,
    &nearest_resampler,
    NULL,
diff --git a/mupen64plus-core/src/plugin/audio_libretro/audio_resampler_driver.h b/mupen64plus-core/src/plugin/audio_libretro/audio_resampler_driver.h
index f5e052b..6c20e8d 100644
--- a/mupen64plus-core/src/plugin/audio_libretro/audio_resampler_driver.h
+++ b/mupen64plus-core/src/plugin/audio_libretro/audio_resampler_driver.h
@@ -140,7 +140,7 @@ typedef struct audio_frame_float
 } audio_frame_float_t;
 
 extern rarch_resampler_t sinc_resampler;
-extern rarch_resampler_t CC_resampler;
+//extern rarch_resampler_t CC_resampler;
 extern rarch_resampler_t nearest_resampler;
 
 #ifndef DONT_HAVE_STRING_LIST