Fix up bad assembler to pass with LLVM's IAS.

4 files changed, 94 insertions, 1 deletions

diff --git a/graphics/evas/distinfo b/graphics/evas/distinfo
index 033b7b315f1..c5d544bbb59 100644
--- a/graphics/evas/distinfo
+++ b/graphics/evas/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2014/05/25 08:12:26 obache Exp $
+$NetBSD: distinfo,v 1.17 2015/02/19 14:19:17 joerg Exp $
 
 SHA1 (evas-1.7.7.tar.bz2) = 680e85a60363df84b81298138cc19629f9f139bc
 RMD160 (evas-1.7.7.tar.bz2) = 306b36018c5ab07712553a554e4a2deac13854ed
@@ -6,5 +6,8 @@ Size (evas-1.7.7.tar.bz2) = 9408256 bytes
 SHA1 (patch-configure) = b7bda6085449a0fdcc51d58371101bb2f8bbc232
 SHA1 (patch-configure.ac) = d9330c131859794beb29414c9afe66a08b6fe55d
 SHA1 (patch-src_lib_engines_common_evas__font__load.c) = b6a0cb75692efc95e81b000f48216f6dd0f1ea27
+SHA1 (patch-src_lib_engines_common_evas__op__blend_op__blend__color__neon.c) = 44254a9b9f3baa0bf54e2732f225cf9247db84cf
+SHA1 (patch-src_lib_engines_common_evas__op__blend_op__blend__pixel__neon.c) = 29b4d5953aba050cab07a87c05f04951e4959599
+SHA1 (patch-src_lib_engines_common_evas__op__copy_op__copy__color__neon.c) = 25d27e9dbc486544cce1f3fded721679421b5e0d
 SHA1 (patch-src_modules_loaders_gif_evas__image__load__gif.c) = 5a61a54fc67f64ba71aed37aba5a094e8d47294a
 SHA1 (patch-src_modules_loaders_psd_evas__image__load__psd.c) = 386f375a68eb4d49b05cc69c041641d11c306082
diff --git a/graphics/evas/patches/patch-src_lib_engines_common_evas__op__blend_op__blend__color__neon.c b/graphics/evas/patches/patch-src_lib_engines_common_evas__op__blend_op__blend__color__neon.c
new file mode 100644
index 00000000000..b4959f478ea
--- /dev/null
+++ b/graphics/evas/patches/patch-src_lib_engines_common_evas__op__blend_op__blend__color__neon.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_lib_engines_common_evas__op__blend_op__blend__color__neon.c,v 1.1 2015/02/19 14:19:18 joerg Exp $
+
+float vs double confusion, use what gas actually produces.
+
+--- src/lib/engines/common/evas_op_blend/op_blend_color_neon.c.orig	2015-02-09 22:12:54.000000000 +0000
++++ src/lib/engines/common/evas_op_blend/op_blend_color_neon.c
+@@ -46,7 +46,7 @@ _op_blend_c_dp_neon(DATA32 *s __UNUSED__
+ 
+ 
+ 	AP "dualloopint:					\n\t"
+-		"vldr.32	d0, [%[d]]		\n\t"
++		"vldr		d0, [%[d]]		\n\t"
+ 		"vmull.u8	q1, d0, d14		\n\t"
+ 		"vqrshrn.u16	d0, q1, #8		\n\t"
+ 		"vqadd.u8	d0, d0, d12		\n\t"
diff --git a/graphics/evas/patches/patch-src_lib_engines_common_evas__op__blend_op__blend__pixel__neon.c b/graphics/evas/patches/patch-src_lib_engines_common_evas__op__blend_op__blend__pixel__neon.c
new file mode 100644
index 00000000000..14ed70527e4
--- /dev/null
+++ b/graphics/evas/patches/patch-src_lib_engines_common_evas__op__blend_op__blend__pixel__neon.c
@@ -0,0 +1,60 @@
+$NetBSD: patch-src_lib_engines_common_evas__op__blend_op__blend__pixel__neon.c,v 1.1 2015/02/19 14:19:18 joerg Exp $
+
+Match opening token. Use instruction gas produces, not what is written.
+
+--- src/lib/engines/common/evas_op_blend/op_blend_pixel_neon.c.orig	2015-02-09 22:09:06.000000000 +0000
++++ src/lib/engines/common/evas_op_blend/op_blend_pixel_neon.c
+@@ -76,7 +76,7 @@ _op_blend_p_dp_neon(DATA32 *s, DATA8 *m,
+ 		"cmp		%[tmp], #32		\n\t"
+ 		"blt		"AP"loopout		\n\t"
+ 
+-		"vldm		%[s]!,	{d0,d1)		\n\t"
++		"vldm		%[s]!,	{d0,d1}		\n\t"
+ 		"vldm		%[d],	{d4,d5}		\n\t"
+ 
+ 
+@@ -111,7 +111,7 @@ _op_blend_p_dp_neon(DATA32 *s, DATA8 *m,
+ 
+ 	AP "octloopint:\n\t"
+ 		//** Oct loop
+-		"vldm	%[s]!,	{d0,d1,d2,d3)		\n\t"
++		"vldm	%[s]!,	{d0,d1,d2,d3}		\n\t"
+ 		"vldm	%[d],	{d4,d5,d6,d7}		\n\t"
+                 "pld    [%[s], #64]                     \n\t"
+                 
+@@ -176,7 +176,7 @@ _op_blend_p_dp_neon(DATA32 *s, DATA8 *m,
+ 		// Add to 's'
+ 		"vqadd.u8	d4,	d8,d0		\n\t"
+ 
+-		"vstr.32	d4,	[%[d]]		\n\t"
++		"vstr		d4,	[%[d]]		\n\t"
+ 		"add		%[d],   #8		\n\t"
+ 
+ 		"cmp 		%[tmp], %[d]		\n\t"
+@@ -268,7 +268,7 @@ _op_blend_pas_dp_neon(DATA32 *s, DATA8 *
+ 
+ 	AP"dualloop:						\n\t"
+ 
+-		"vldm	%[s]!,	{d0)				\n\t"
++		"vldm	%[s]!,	{d0}				\n\t"
+ 		"vldm	%[d],	{d4}				\n\t"
+ 
+ 		// Subtract from 255 (ie negate) and extract alpha channel
+@@ -299,7 +299,7 @@ _op_blend_pas_dp_neon(DATA32 *s, DATA8 *
+ 		"sub		%[tmp], %[e],  #31		\n\t"
+ 
+         AP"quadloop:\n\t"
+-		"vldm	%[s]!,	{d0,d1,d2,d3)			\n\t"
++		"vldm	%[s]!,	{d0,d1,d2,d3}			\n\t"
+ 		"vldm	%[d],	{d4,d5,d6,d7}			\n\t"
+ 
+ 		// Subtract from 255 (ie negate) and extract alpha channel
+@@ -350,7 +350,7 @@ _op_blend_pas_dp_neon(DATA32 *s, DATA8 *
+ 		"sub		%[tmp],%[e],$0x7		\n\t"
+ 
+ 	AP"dualloop2:						\n\t"
+-		"vldm		%[s]!,	{d0)			\n\t"
++		"vldm		%[s]!,	{d0}			\n\t"
+ 		"vldm		%[d],	{d4}			\n\t"
+ 
+ 		// Subtract from 255 (ie negate) and extract alpha channel
diff --git a/graphics/evas/patches/patch-src_lib_engines_common_evas__op__copy_op__copy__color__neon.c b/graphics/evas/patches/patch-src_lib_engines_common_evas__op__copy_op__copy__color__neon.c
new file mode 100644
index 00000000000..62e8dcaf3a4
--- /dev/null
+++ b/graphics/evas/patches/patch-src_lib_engines_common_evas__op__copy_op__copy__color__neon.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_lib_engines_common_evas__op__copy_op__copy__color__neon.c,v 1.1 2015/02/19 14:19:18 joerg Exp $
+
+float vs double confusion, use what gas actually produces.
+
+--- src/lib/engines/common/evas_op_copy/op_copy_color_neon.c.orig	2015-02-09 22:11:34.000000000 +0000
++++ src/lib/engines/common/evas_op_copy/op_copy_color_neon.c
+@@ -30,7 +30,7 @@ _op_copy_c_dp_neon(DATA32 *s, DATA8 *m, 
+ 		"blt		"AP"loopout		\n\t"
+ 
+ 	AP"dualloop:					\n\t"
+-		"vstr.32	d0, [%[d]]		\n\t"
++		"vstr		d0, [%[d]]		\n\t"
+ 
+ 		"add		%[d], #8		\n\t"
+ 		"andS		%[tmp], %[d], $0x1f	\n\t"