pixman: Branch 'master'

[Siarhei Siamashka]

 pixman/pixman-arm-neon-asm-bilinear.S |    1 +
 pixman/pixman-arm-neon-asm.S          |    1 +
 pixman/pixman-arm-simd-asm.S          |    1 +
 3 files changed, 3 insertions(+)

New commits:
commit b8d6babc91459a9f854695b56f0265298a3c6427
Author: Siarhei Siamashka <siarhei.siamashka at nokia.com>
Date:   Sat Jul 23 00:27:34 2011 +0300

    ARM: workaround binutils bug #12931 (code sections alignment)
    
    More details in binutils bugtracker:
      http://sourceware.org/bugzilla/show_bug.cgi?id=12931
    
    The problem was encountered in the wild by Mozilla:
      https://bugzilla.mozilla.org/show_bug.cgi?id=672787

diff --git a/pixman/pixman-arm-neon-asm-bilinear.S b/pixman/pixman-arm-neon-asm-bilinear.S
index 9a4a1ff..3c7fe0f 100644
--- a/pixman/pixman-arm-neon-asm-bilinear.S
+++ b/pixman/pixman-arm-neon-asm-bilinear.S
@@ -66,6 +66,7 @@
 .eabi_attribute 12, 0
 .arm
 .altmacro
+.p2align 2
 
 #include "pixman-arm-neon-asm.h"
 
diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
index 7cddf7e..e32bfa1 100644
--- a/pixman/pixman-arm-neon-asm.S
+++ b/pixman/pixman-arm-neon-asm.S
@@ -47,6 +47,7 @@
     .eabi_attribute 12, 0 /* suppress Tag_Advanced_SIMD_arch */
     .arm
     .altmacro
+    .p2align 2
 
 #include "pixman-arm-neon-asm.h"
 
diff --git a/pixman/pixman-arm-simd-asm.S b/pixman/pixman-arm-simd-asm.S
index 858c690..8fe1b50 100644
--- a/pixman/pixman-arm-simd-asm.S
+++ b/pixman/pixman-arm-simd-asm.S
@@ -35,6 +35,7 @@
 	.object_arch armv4
 	.arm
 	.altmacro
+	.p2align 2
 
 /* Supplementary macro for setting function attributes */
 .macro pixman_asm_function fname