From: Mans Rullgard <mans@mansr.com>
Date: Fri, 13 Jan 2012 18:56:36 +0000 (+0000)
Subject: ARM: 4-byte align start of all asm functions
X-Git-Tag: v0.8~62
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c5e1ea3cdccc5af0b2d3de15a9c3739c30ec88c;p=platform%2Fupstream%2Flibav.git

ARM: 4-byte align start of all asm functions

Due to apprent bugs in the GNU assembler and/or linker, relocations
can be incorrectly processed if the alignment of a Thumb instruction
is changed in the output file compared to the input object.

This fixes crashes in h264 decoding with Thumb enabled. No effect in
ARM mode since everything is 4-byte aligned there.

Signed-off-by: Mans Rullgard <mans@mansr.com>
---

diff --git a/libavcodec/arm/asm.S b/libavcodec/arm/asm.S
index aaf497e..3b495a2 100644
--- a/libavcodec/arm/asm.S
+++ b/libavcodec/arm/asm.S
@@ -68,6 +68,7 @@ ELF     .size   \name, . - \name
         .purgem endfunc
     .endm
         .text
+        .align          2
     .if \export
         .global EXTERN_ASM\name
 EXTERN_ASM\name: