neon filters: fix build on old toolchains

diff --git a/arm/neon_eagle2x.S b/arm/neon_eagle2x.S
index aa70021..4169550 100644 (file)
--- a/arm/neon_eagle2x.S
+++ b/arm/neon_eagle2x.S
@@ -22,8 +22,8 @@
 \r
 .arm\r
 \r
-#include "neon_eagle2x.Sinc"\r
 #include "neon_normalxx.Sinc"\r
+#include "neon_eagle2x.Sinc"\r
 \r
 .global neon_eagle2x_8_8\r
 .global neon_eagle2x_16_16\r
@@ -50,10 +50,10 @@ neon_eagle2x_8_8:
         add r6, r1, ip                  @ r6 = dst + dststride\r
         sub sp, sp, #64                 @ sp -= 64\r
         sub r3, r3, r2                  @ r3 = srcstride - width\r
-        vst1.64 {d8-d11}, [sp:256]      @ save q4,q5\r
+        vst1.64 {d8-d11}, [sp,:256]     @ save q4,q5\r
         add r7, sp, #32                 @ r7 = sp + 32\r
         sub ip, ip, r2                  @ ip = dststride - width\r
-        vst1.64 {d12-d15}, [r7:256]     @ save q6,q7\r
+        vst1.64 {d12-d15}, [r7,:256]    @ save q6,q7\r
         lsl ip, #1                      @ ip = 2 * dststride - 2 * width\r
         mov r7, r2                      @ r7 = width\r
         sub r9, r9, #2                  @ r9 = height - 2\r
@@ -101,9 +101,9 @@ neon_eagle2x_8_8:
         neon_eagle2x_8_8_line last, r4, r0, r5, r7, r1, r6, r8, 0, 0\r
 \r
         add ip, sp, #32                 @ ip = sp + 32\r
-        vld1.64 {d8-d11}, [sp:256]      @ restore q4,q5\r
+        vld1.64 {d8-d11}, [sp,:256]     @ restore q4,q5\r
         mov sp, r10                     @ sp = oldsp\r
-        vld1.64 {d12-d15}, [ip:256]     @ restore q6,q7\r
+        vld1.64 {d12-d15}, [ip,:256]    @ restore q6,q7\r
         pop {r4-r10}\r
         bx lr\r
 \r
@@ -130,10 +130,10 @@ neon_eagle2x_16_16:
         add r6, r1, ip                  @ r6 = dst + dststride\r
         sub sp, sp, #64                 @ sp -= 64\r
         sub r3, r3, r2, lsl #1          @ r3 = srcstride - 2 * width\r
-        vst1.64 {d8-d11}, [sp:256]      @ save q4,q5\r
+        vst1.64 {d8-d11}, [sp,:256]     @ save q4,q5\r
         add r7, sp, #32                 @ r7 = sp + 32\r
         sub ip, ip, r2, lsl #1          @ ip = dststride - 2 * width\r
-        vst1.64 {d12-d15}, [r7:256]     @ save q6,q7\r
+        vst1.64 {d12-d15}, [r7,:256]    @ save q6,q7\r
         lsl ip, #1                      @ ip = 2 * dststride - 4 * width\r
         mov r7, r2                      @ r7 = width\r
         sub r9, r9, #2                  @ r9 = height - 2\r
@@ -180,9 +180,9 @@ neon_eagle2x_16_16:
         neon_eagle2x_16_16_line last, r4, r0, r5, r7, r1, r6, r8, 0, 0\r
 \r
         add ip, sp, #32                 @ ip = sp + 32\r
-        vld1.64 {d8-d11}, [sp:256]      @ restore q4,q5\r
+        vld1.64 {d8-d11}, [sp,:256]     @ restore q4,q5\r
         mov sp, r10                     @ sp = oldsp\r
-        vld1.64 {d12-d15}, [ip:256]     @ restore q6,q7\r
+        vld1.64 {d12-d15}, [ip,:256]    @ restore q6,q7\r
         pop {r4-r10}\r
         bx lr\r
 \r
@@ -222,9 +222,9 @@ neon_eagle2x_8_16:
         mov lr, sp                  @ tmpline1 = sp\r
         bic sp, sp, #31             @ align sp to 32 bytes\r
         sub r8, sp, #64             @ r8 = sp - 64\r
-        vst1.64 {d8-d11}, [r8:256]  @ save q4,q5\r
+        vst1.64 {d8-d11}, [r8,:256] @ save q4,q5\r
         sub r9, sp, #32             @ r9 = sp - 32\r
-        vst1.64 {d12-d15}, [r9:256] @ save q6,q7\r
+        vst1.64 {d12-d15}, [r9,:256]@ save q6,q7\r
         sub sp, sp, #(36 + 64)      @ sp -= (36 + 64)\r
         str r6, [sp]                @ oldsp = r6\r
         str r5, [sp, #4]            @ height = r5\r
@@ -327,9 +327,9 @@ neon_eagle2x_8_16:
 \r
         add r6, sp, #36             @ r6 = sp + 36\r
         ldr sp, [sp]                @ sp = oldsp\r
-        vld1.64 {d8-d11}, [r6:256]  @ restore q4,q5\r
+        vld1.64 {d8-d11}, [r6,:256] @ restore q4,q5\r
         add ip, r6, #32             @ ip = r6 + 32\r
-        vld1.64 {d12-d15}, [ip:256] @ restore q6,q7\r
+        vld1.64 {d12-d15}, [ip,:256]@ restore q6,q7\r
         pop {r4-r11,lr}\r
         bx lr\r
 \r

diff --git a/arm/neon_eagle2x.Sinc b/arm/neon_eagle2x.Sinc
index 7413312..cfbd303 100644 (file)
--- a/arm/neon_eagle2x.Sinc
+++ b/arm/neon_eagle2x.Sinc
@@ -751,9 +751,9 @@
     .else\r
 \r
     .ifeq \dstalign32\r
-        _neon_eagle2x_16_16_line_\part \src1, \src2, \src3, \counter, \dst1, \dst2, \reg1, \src1:128, \src2:128, \src3:128, \dst1, \dst2\r
+        _neon_eagle2x_16_16_line_\part \src1, \src2, \src3, \counter, \dst1, \dst2, \reg1, \src1 A128, \src2 A128, \src3 A128, \dst1, \dst2\r
     .else\r
-        _neon_eagle2x_16_16_line_\part \src1, \src2, \src3, \counter, \dst1, \dst2, \reg1, \src1:128, \src2:128, \src3:128, \dst1:256, \dst2:256\r
+        _neon_eagle2x_16_16_line_\part \src1, \src2, \src3, \counter, \dst1, \dst2, \reg1, \src1 A128, \src2 A128, \src3 A128, \dst1 A256, \dst2 A256\r
     .endif\r
 \r
     .endif\r

diff --git a/arm/neon_normalxx.Sinc b/arm/neon_normalxx.Sinc
index fcbcfd4..0391e12 100644 (file)
--- a/arm/neon_normalxx.Sinc
+++ b/arm/neon_normalxx.Sinc
@@ -21,6 +21,15 @@
 @@\r
 \r
 \r
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 4)\r
+/* can't use because gas wants ',' before ':' */\r
+#define A128\r
+#define A256\r
+#else\r
+#define A128 :128\r
+#define A256 :256\r
+#endif\r
+\r
 \r
 .macro _neon_normalxx_8_16_line_middle src, dst, pal, counter, reg1, reg2, reg3, reg4, reg5, reg6, reg7, reg8, reg9, dststride, dA, dB\r
         ldr \reg1, [\src]                   @ reg1 = src[0-3]\r

diff --git a/arm/neon_scale2x.S b/arm/neon_scale2x.S
index 5c68cc6..ef568d9 100644 (file)
--- a/arm/neon_scale2x.S
+++ b/arm/neon_scale2x.S
@@ -22,8 +22,8 @@
 \r
 .arm\r
 \r
-#include "neon_scale2x.Sinc"\r
 #include "neon_normalxx.Sinc"\r
+#include "neon_scale2x.Sinc"\r
 \r
 .global neon_scale2x_8_8\r
 .global neon_scale2x_16_16\r

diff --git a/arm/neon_scale2x.Sinc b/arm/neon_scale2x.Sinc
index e9a80ff..a3379ca 100644 (file)
--- a/arm/neon_scale2x.Sinc
+++ b/arm/neon_scale2x.Sinc
@@ -464,9 +464,9 @@
     .else\r
 \r
     .ifeq \dstalign32\r
-        _neon_scale2x_16_16_line_\part \src1, \src2, \src3, \counter, \dst1, \dst2, \reg1, \src1:128, \src2:128, \src3:128, \dst1, \dst2\r
+        _neon_scale2x_16_16_line_\part \src1, \src2, \src3, \counter, \dst1, \dst2, \reg1, \src1 A128, \src2 A128, \src3 A128, \dst1, \dst2\r
     .else\r
-        _neon_scale2x_16_16_line_\part \src1, \src2, \src3, \counter, \dst1, \dst2, \reg1, \src1:128, \src2:128, \src3:128, \dst1:256, \dst2:256\r
+        _neon_scale2x_16_16_line_\part \src1, \src2, \src3, \counter, \dst1, \dst2, \reg1, \src1 A128, \src2 A128, \src3 A128, \dst1 A256, \dst2 A256\r
     .endif\r
 \r
     .endif\r