0002-arm_neon-use-a-macro-to-fix-compilation-for-iOS.patch 4.2 KB
Newer Older
1
From 5771223af5c3a15bea6f4c984c13c2572fc4c5be Mon Sep 17 00:00:00 2001
Felix Paul Kühne's avatar
Felix Paul Kühne committed
2 3
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 10 Aug 2012 16:01:49 +0200
4
Subject: [PATCH 02/17] arm_neon: use a macro to fix compilation for iOS
Felix Paul Kühne's avatar
Felix Paul Kühne committed
5 6

---
7 8
 modules/arm_neon/amplify.S              |  9 +++---
 modules/arm_neon/simple_channel_mixer.S | 57 +++++++++++++++------------------
Felix Paul Kühne's avatar
Felix Paul Kühne committed
9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206
 2 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/modules/arm_neon/amplify.S b/modules/arm_neon/amplify.S
index 5938118..578f972 100644
--- a/modules/arm_neon/amplify.S
+++ b/modules/arm_neon/amplify.S
@@ -18,6 +18,8 @@
  @ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  @****************************************************************************/
 
+#include "asm.S"
+
 	.syntax	unified
 	.arm
 	.fpu	neon
@@ -26,10 +28,8 @@
 #define	DST	r0
 #define	SRC	r1
 #define	SIZE	r2
-	.align 2
-	.global amplify_float_arm_neon
-	.type	amplify_float_arm_neon, %function
-amplify_float_arm_neon:
+
+function amplify_float_arm_neon, export=1
 	cmp		SIZE,	#0
 	bxeq		lr
 #ifdef __ARM_PCS
@@ -79,3 +79,4 @@ amplify_float_arm_neon:
 4:	vst1.f32	{d20-d21},	[DST,:128]!
 5:	vst1.f32	{d16-d17},	[DST,:128]!
 	bx		lr
+endfunc
diff --git a/modules/arm_neon/simple_channel_mixer.S b/modules/arm_neon/simple_channel_mixer.S
index dcc51ed..4722be4 100644
--- a/modules/arm_neon/simple_channel_mixer.S
+++ b/modules/arm_neon/simple_channel_mixer.S
@@ -19,6 +19,8 @@
  @ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  @****************************************************************************/
 
+#include "asm.S"
+
 	.fpu neon
 	.text
 	.align 2
@@ -34,9 +36,8 @@ coeff_7to2:
 	.float 0.5
 	.float 0.25
 	.float 0.25
-	.global convert_7to2_neon_asm
-	.type	convert_7to2_neon_asm, %function
-convert_7to2_neon_asm:
+
+function convert_7to2_neon_asm, export=1
 	push {r4,lr}
 
 	adr COEFF, coeff_7to2
@@ -63,16 +64,15 @@ convert_7to2_neon_asm:
 	bne 0b
 
 	pop {r4,pc}
-
+endfunc
 
 coeff_5to2:
 	.float 0.5
 	.float 0.5
 	.float 0.33
 	.float 0.33
-	.global convert_5to2_neon_asm
-	.type	convert_5to2_neon_asm, %function
-convert_5to2_neon_asm:
+
+function convert_5to2_neon_asm, export=1
 	push {r4,lr}
 
 	adr COEFF, coeff_5to2
@@ -95,14 +95,13 @@ convert_5to2_neon_asm:
 	bne 0b
 
 	pop {r4,pc}
-
+endfunc
 
 coeff_4to2:
 	.float 0.5
 	.float 0.5
-	.global convert_4to2_neon_asm
-	.type	convert_4to2_neon_asm, %function
-convert_4to2_neon_asm:
+
+function convert_4to2_neon_asm, export=1
 	push {r4,lr}
 
 	adr COEFF, coeff_4to2
@@ -119,14 +118,13 @@ convert_4to2_neon_asm:
 	bne 0b
 
 	pop {r4,pc}
-
+endfunc
 
 coeff_3to2:
 	.float 0.5
 	.float 0.5
-	.global convert_3to2_neon_asm
-	.type	convert_3to2_neon_asm, %function
-convert_3to2_neon_asm:
+
+function convert_3to2_neon_asm, export=1
 	push {r4,lr}
 
 	adr COEFF, coeff_3to2
@@ -147,16 +145,15 @@ convert_3to2_neon_asm:
 	bne 0b
 
 	pop {r4,pc}
-
+endfunc
 
 coeff_7to1:
 	.float 0.25
 	.float 0.25
 	.float 0.125
 	.float 0.125
-	.global convert_7to1_neon_asm
-	.type	convert_7to1_neon_asm, %function
-convert_7to1_neon_asm:
+
+function convert_7to1_neon_asm, export=1
 	push {r4,lr}
 
 	adr COEFF, coeff_7to1
@@ -181,16 +178,15 @@ convert_7to1_neon_asm:
 	bne 0b
 
 	pop {r4,pc}
-
+endfunc
 
 coeff_5to1:
 	.float 0.25
 	.float 0.25
 	.float 0.16666667
 	.float 0.16666667
-	.global convert_5to1_neon_asm
-	.type	convert_5to1_neon_asm, %function
-convert_5to1_neon_asm:
+
+function convert_5to1_neon_asm, export=1
 	push {r4,lr}
 
 	adr COEFF, coeff_5to1
@@ -212,16 +208,15 @@ convert_5to1_neon_asm:
 	bne 0b
 
 	pop {r4,pc}
-
+endfunc
 
 coeff_7to4:
 	.float 0.5
 	.float 0.5
 	.float 0.16666667
 	.float 0.16666667
-	.global convert_7to4_neon_asm
-	.type	convert_7to4_neon_asm, %function
-convert_7to4_neon_asm:
+
+function convert_7to4_neon_asm, export=1
 	push {r4,lr}
 
 	adr COEFF, coeff_7to4
@@ -247,14 +242,13 @@ convert_7to4_neon_asm:
 	bne 0b
 
 	pop {r4,pc}
-
+endfunc
 
 coeff_5to4:
 	.float 0.5
 	.float 0.5
-	.global convert_5to4_neon_asm
-	.type	convert_5to4_neon_asm, %function
-convert_5to4_neon_asm:
+
+function convert_5to4_neon_asm, export=1
 	push {r4,lr}
 
 	adr COEFF, coeff_5to4
@@ -277,3 +271,4 @@ convert_5to4_neon_asm:
 	bne 0b
 
 	pop {r4,pc}
+endfunc
-- 
207
1.8.3.4 (Apple Git-47)
Felix Paul Kühne's avatar
Felix Paul Kühne committed
208