From 50172454d220d1693e928e68b73deb8bf7ef3fe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francisco=20Jos=C3=A9=20Garc=C3=ADa=20Garc=C3=ADa?=
 <frangarcj@gmail.com>
Date: Fri, 18 Sep 2015 01:21:24 +0200
Subject: [PATCH] (Vita) Remove -U__ARM_NEON__

---
 Makefile.griffin               | 3 ++-
 audio/audio_utils.c            | 4 ++--
 audio/audio_utils.h            | 2 +-
 audio/drivers_resampler/sinc.c | 7 +++----
 performance.c                  | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile.griffin b/Makefile.griffin
index 0fb319ce5f..88b71e049f 100644
--- a/Makefile.griffin
+++ b/Makefile.griffin
@@ -202,7 +202,7 @@ else ifeq ($(platform), vita)
   EXT_TARGET := $(TARGET_NAME)_$(platform).velf
   EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf
   MACHDEP := -DVITA
-  PLATCFLAGS :=  -O3 -mfloat-abi=hard -ffast-math -fsingle-precision-constant -U__ARM_NEON__
+  PLATCFLAGS :=  -O3 -mfloat-abi=hard -ffast-math -fsingle-precision-constant 
   LIBS += -lSceKernel_stub -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub \
 			 -lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub \
 			 -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lz -lm -lc
@@ -213,6 +213,7 @@ else ifeq ($(platform), vita)
   LIBDIRS += -L.
   LDFLAGS +=  -Wl,-q
 
+  HAVE_FILTERS_BUILTIN     := 1
   HAVE_LIBRETRO_MANAGEMENT := 1
   HAVE_BUILTIN_AUTOCONFIG  := 1
   HAVE_RPNG                := 1
diff --git a/audio/audio_utils.c b/audio/audio_utils.c
index 6fb1196df4..9808e378ae 100644
--- a/audio/audio_utils.c
+++ b/audio/audio_utils.c
@@ -215,7 +215,7 @@ void audio_convert_float_to_s16_altivec(int16_t *out,
    }
    audio_convert_float_to_s16_C(out, in, samples_in);
 }
-#elif defined(__ARM_NEON__)
+#elif defined(__ARM_NEON__) && !defined(VITA)
 /* Avoid potential hard-float/soft-float ABI issues. */
 void audio_convert_s16_float_asm(float *out, const int16_t *in,
       size_t samples, const float *gain);
@@ -426,7 +426,7 @@ void audio_convert_init_simd(void)
    unsigned cpu = audio_convert_get_cpu_features();
 
    (void)cpu;
-#if defined(__ARM_NEON__) 
+#if defined(__ARM_NEON__) && !defined(VITA)
    audio_convert_s16_to_float_arm = cpu & RETRO_SIMD_NEON ?
       audio_convert_s16_to_float_neon : audio_convert_s16_to_float_C;
    audio_convert_float_to_s16_arm = cpu & RETRO_SIMD_NEON ?
diff --git a/audio/audio_utils.h b/audio/audio_utils.h
index 915f44881a..024ece150f 100644
--- a/audio/audio_utils.h
+++ b/audio/audio_utils.h
@@ -93,7 +93,7 @@ void audio_convert_s16_to_float_altivec(float *out,
 void audio_convert_float_to_s16_altivec(int16_t *out,
       const float *in, size_t samples);
 
-#elif defined(__ARM_NEON__)
+#elif defined(__ARM_NEON__) && !defined(VITA)
 #define audio_convert_s16_to_float audio_convert_s16_to_float_arm
 #define audio_convert_float_to_s16 audio_convert_float_to_s16_arm
 
diff --git a/audio/drivers_resampler/sinc.c b/audio/drivers_resampler/sinc.c
index 2ae4edf194..8605aeae3d 100644
--- a/audio/drivers_resampler/sinc.c
+++ b/audio/drivers_resampler/sinc.c
@@ -334,7 +334,7 @@ static void process_sinc(rarch_sinc_resampler_t *resamp, float *out_buffer)
    /* movehl { X, R, X, L } == { X, R, X, R } */
    _mm_store_ss(out_buffer + 1, _mm_movehl_ps(sum, sum));
 }
-#elif defined(__ARM_NEON__)
+#elif defined(__ARM_NEON__) && !defined(VITA)
 
 #if SINC_COEFF_LERP
 #error "NEON asm does not support SINC lerp."
@@ -437,7 +437,7 @@ static void *resampler_sinc_new(const struct resampler_config *config,
    }
 
    /* Be SIMD-friendly. */
-#if (defined(__AVX__) && ENABLE_AVX) || defined(__ARM_NEON__)
+#if (defined(__AVX__) && ENABLE_AVX) || (defined(__ARM_NEON__)&& !defined(VITA))
    re->taps = (re->taps + 7) & ~7;
 #else
    re->taps = (re->taps + 3) & ~3;
@@ -460,7 +460,7 @@ static void *resampler_sinc_new(const struct resampler_config *config,
    init_sinc_table(re, cutoff, re->phase_table,
          1 << PHASE_BITS, re->taps, SINC_COEFF_LERP);
 
-#if defined(__ARM_NEON__)
+#if defined(__ARM_NEON__) && !defined(VITA)
    process_sinc_func = mask & RESAMPLER_SIMD_NEON 
       ? process_sinc_neon : process_sinc_C;
 #endif
@@ -480,4 +480,3 @@ rarch_resampler_t sinc_resampler = {
    "sinc",
    "sinc"
 };
-
diff --git a/performance.c b/performance.c
index c4c243551a..d2258a67b8 100644
--- a/performance.c
+++ b/performance.c
@@ -331,7 +331,7 @@ static uint64_t xgetbv_x86(uint32_t idx)
 }
 #endif
 
-#if defined(__ARM_NEON__)
+#if defined(__ARM_NEON__)  
 static void arm_enable_runfast_mode(void)
 {
    /* RunFast mode. Enables flush-to-zero and some