From 2dfb9b96386625043cfa1b62b04e0a0cbec05b12 Mon Sep 17 00:00:00 2001
From: Twinaphex <libretro@gmail.com>
Date: Sat, 25 Feb 2017 02:15:15 +0100
Subject: [PATCH] Revert "Attempt to not use this codepath for arm64"

This reverts commit a16ba8450267b1c28a9513731620ba59399bf05f.
---
 libretro-common/audio/conversion/float_to_s16.c | 6 +++---
 libretro-common/audio/conversion/s16_to_float.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libretro-common/audio/conversion/float_to_s16.c b/libretro-common/audio/conversion/float_to_s16.c
index d07f8bd9c9..8a4337fbc2 100644
--- a/libretro-common/audio/conversion/float_to_s16.c
+++ b/libretro-common/audio/conversion/float_to_s16.c
@@ -31,7 +31,7 @@
 #include <features/features_cpu.h>
 #include <audio/conversion/float_to_s16.h>
 
-#if defined(__ARM_NEON__) && !defined(__arm64__)
+#if defined(__ARM_NEON__)
 static bool float_to_s16_neon_enabled = false;
 void convert_float_s16_asm(int16_t *out, const float *in, size_t samples);
 #endif
@@ -91,7 +91,7 @@ void convert_float_to_s16(int16_t *out,
 
    samples = samples_in;
    i       = 0;
-#elif defined(__ARM_NEON__) && !defined(__arm64__)
+#elif defined(__ARM_NEON__)
    if (float_to_s16_neon_enabled)
    {
       size_t aligned_samples = samples & ~7;
@@ -151,7 +151,7 @@ void convert_float_to_s16(int16_t *out,
  **/
 void convert_float_to_s16_init_simd(void)
 {
-#if defined(__ARM_NEON__) && !defined(__arm64__)
+#if defined(__ARM_NEON__)
    unsigned cpu = cpu_features_get();
 
    if (cpu & RETRO_SIMD_NEON)
diff --git a/libretro-common/audio/conversion/s16_to_float.c b/libretro-common/audio/conversion/s16_to_float.c
index e8966b9d0b..c0317f1b59 100644
--- a/libretro-common/audio/conversion/s16_to_float.c
+++ b/libretro-common/audio/conversion/s16_to_float.c
@@ -29,7 +29,7 @@
 #include <features/features_cpu.h>
 #include <audio/conversion/s16_to_float.h>
 
-#if defined(__ARM_NEON__) && !defined(__arm64__)
+#if defined(__ARM_NEON__)
 static bool s16_to_float_neon_enabled = false;
 
 /* Avoid potential hard-float/soft-float ABI issues. */
@@ -99,7 +99,7 @@ void convert_s16_to_float(float *out,
    samples = samples_in;
    i       = 0;
 
-#elif defined(__ARM_NEON__) && !defined(__arm64__)
+#elif defined(__ARM_NEON__)
    if (s16_to_float_neon_enabled)
    {
       size_t aligned_samples = samples & ~7;
@@ -180,7 +180,7 @@ void convert_s16_to_float(float *out,
  **/
 void convert_s16_to_float_init_simd(void)
 {
-#if defined(__ARM_NEON__) && !defined(__arm64__)
+#if defined(__ARM_NEON__)
    unsigned cpu = cpu_features_get();
 
    if (cpu & RETRO_SIMD_NEON)