From 4ae83961a97c97cf6bf7e775cc08337b292b9853 Mon Sep 17 00:00:00 2001
From: notaz
Date: Mon, 1 Apr 2013 01:08:33 +0300
Subject: still adjusting asm for better as compatibility..

---
 plugins/dfsound/arm_utils.S | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/dfsound/arm_utils.S b/plugins/dfsound/arm_utils.S
index ddc3714..cbcc7f7 100644
--- a/plugins/dfsound/arm_utils.S
+++ b/plugins/dfsound/arm_utils.S
@@ -10,15 +10,28 @@
 
 #include "arm_features.h"
 
+#ifdef __MACH__
+.data
+.align 2
+ptr_ChanBuf:   .word _ChanBuf
+ptr_SSumLR:    .word _SSumLR
+ptr_sRVBStart: .word _sRVBStart
+#endif
+
 .text
 .align 2
 
 .macro load_varadr reg var
 #if defined(__ARM_ARCH_7A__) && !defined(__PIC__)
-	movw	\reg, #:lower16:EVAR(\var)
-	movt	\reg, #:upper16:EVAR(\var)
+	movw	\reg, #:lower16:ESYM(\var)
+	movt	\reg, #:upper16:ESYM(\var)
+#elif defined(__ARM_ARCH_7A__) && defined(__MACH__)
+	movw	\reg, #:lower16:(ptr_\var-(1678f+4))
+	movt	\reg, #:upper16:(ptr_\var-(1678f+4))
+1678:
+	ldr	\reg, [pc, \reg]
 #else
-	ldr	\reg, =EVAR(\var)
+	ldr	\reg, =ESYM(\var)
 #endif
 .endm
 
-- 
cgit v1.2.3