[vlc-commits] arm_neon: align ARM ASM to 4 bytes to work-around the linker on iOS

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Jul 25 23:28:15 2012 -0300| [dbc3a76365dda034a7219d3208cd2ec459ed3a54] | committer: Felix Paul Kühne

arm_neon: align ARM ASM to 4 bytes to work-around the linker on iOS

This matches a similar problem on x264: http://mailman.videolan.org/pipermail/x264-devel/2012-January/009073.html

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dbc3a76365dda034a7219d3208cd2ec459ed3a54
---

 modules/arm_neon/i420_rgb.S  |    2 +-
 modules/arm_neon/i420_yuyv.S |    2 +-
 modules/arm_neon/i422_yuyv.S |    2 +-
 modules/arm_neon/nv12_rgb.S  |    2 +-
 modules/arm_neon/nv21_rgb.S  |    2 +-
 modules/arm_neon/s32_s16.S   |    2 +-
 modules/arm_neon/yuyv_i422.S |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/arm_neon/i420_rgb.S b/modules/arm_neon/i420_rgb.S
index 1e9600e..cbf946d 100644
--- a/modules/arm_neon/i420_rgb.S
+++ b/modules/arm_neon/i420_rgb.S
@@ -74,7 +74,7 @@ coefficients:
     .short    4992
     .short  -18432
 
-	.align
+	.align 2
 	.global i420_rgb_neon
 	.type	i420_rgb_neon, %function
 i420_rgb_neon:
diff --git a/modules/arm_neon/i420_yuyv.S b/modules/arm_neon/i420_yuyv.S
index 5265928..8d28264 100644
--- a/modules/arm_neon/i420_yuyv.S
+++ b/modules/arm_neon/i420_yuyv.S
@@ -35,7 +35,7 @@
 #define COUNT	ip
 #define OPITCH	lr
 
-	.align
+	.align 2
 	.global i420_yuyv_neon
 	.type	i420_yuyv_neon, %function
 i420_yuyv_neon:
diff --git a/modules/arm_neon/i422_yuyv.S b/modules/arm_neon/i422_yuyv.S
index 2c9f5c8..6030f52 100644
--- a/modules/arm_neon/i422_yuyv.S
+++ b/modules/arm_neon/i422_yuyv.S
@@ -31,7 +31,7 @@
 #define COUNT	ip
 #define YPAD	lr
 
-	.align
+	.align 2
 	.global i422_yuyv_neon
 	.type	i422_yuyv_neon, %function
 i422_yuyv_neon:
diff --git a/modules/arm_neon/nv12_rgb.S b/modules/arm_neon/nv12_rgb.S
index 64a2d76..94c60a7 100644
--- a/modules/arm_neon/nv12_rgb.S
+++ b/modules/arm_neon/nv12_rgb.S
@@ -74,7 +74,7 @@ coefficients:
     .short    4992
     .short  -18432
 
-	.align
+	.align 2
 	.global nv12_rgb_neon
 	.type	nv12_rgb_neon, %function
 nv12_rgb_neon:
diff --git a/modules/arm_neon/nv21_rgb.S b/modules/arm_neon/nv21_rgb.S
index b7f9745..ed25fc8 100644
--- a/modules/arm_neon/nv21_rgb.S
+++ b/modules/arm_neon/nv21_rgb.S
@@ -74,7 +74,7 @@ coefficients:
     .short    4992
     .short  -18432
 
-	.align
+	.align 2
 	.global nv21_rgb_neon
 	.type	nv21_rgb_neon, %function
 nv21_rgb_neon:
diff --git a/modules/arm_neon/s32_s16.S b/modules/arm_neon/s32_s16.S
index 644a76c..9e2cbfb 100644
--- a/modules/arm_neon/s32_s16.S
+++ b/modules/arm_neon/s32_s16.S
@@ -27,7 +27,7 @@
 #define	BUF	r3
 #define HALF	ip
 
-	.align
+	.align 2
 	.global s32_s16_neon
 	.type	s32_s16_neon, %function
 	@ Converts fixed-point 32-bits to signed 16-bits
diff --git a/modules/arm_neon/yuyv_i422.S b/modules/arm_neon/yuyv_i422.S
index 9a0dd82..d149193 100644
--- a/modules/arm_neon/yuyv_i422.S
+++ b/modules/arm_neon/yuyv_i422.S
@@ -31,7 +31,7 @@
 #define COUNT	ip
 #define YPAD	lr
 
-	.align
+	.align 2
 	.global yuyv_i422_neon
 	.type	yuyv_i422_neon, %function
 yuyv_i422_neon: