From 665f33e1e8ce2e40a7939a33075c3bce1c90790c Mon Sep 17 00:00:00 2001
From: notaz
Date: Fri, 30 Nov 2012 02:53:25 +0200
Subject: improve ARM feature detection

---
 plugins/dfsound/arm_utils.S | 3 ++-
 plugins/dfsound/spu.c       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'plugins/dfsound')

diff --git a/plugins/dfsound/arm_utils.S b/plugins/dfsound/arm_utils.S
index 22e5844..f4ef243 100644
--- a/plugins/dfsound/arm_utils.S
+++ b/plugins/dfsound/arm_utils.S
@@ -8,6 +8,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "arm_features.h"
 
 .text
 .align 2
@@ -100,7 +101,7 @@ mcr_finish:
     vstmiage    r3!, {d8}
     bx          lr
 
-#else
+#elif defined(HAVE_ARMV5)
 
 .global mix_chan @ (int start, int count, int lv, int rv)
 mix_chan:
diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index 45a7886..2466569 100644
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -25,6 +25,7 @@
 #include "externals.h"
 #include "registers.h"
 #include "out.h"
+#include "arm_features.h"
 
 #ifdef ENABLE_NLS
 #include <libintl.h>
@@ -615,7 +616,7 @@ static int do_samples_noise(int ch, int ns, int ns_to)
  return ret;
 }
 
-#ifdef __arm__
+#ifdef HAVE_ARMV5
 // asm code; lv and rv must be 0-3fff
 extern void mix_chan(int start, int count, int lv, int rv);
 extern void mix_chan_rvb(int start, int count, int lv, int rv);
-- 
cgit v1.2.3