From 5dae4872357613a0b51120b54a4c5221e0ec3f69 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Tue, 7 Jan 2014 12:13:11 +0200 Subject: arm: Allow overriding the alignment set in the function macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The function macro always sets .align 2 before declaring the function label (since 5c5e1ea3) and always sets the section to .text (since 278caa6a). The .align 5 before certain functions, added in fc252eba, were added before .text and .align were added to the function macro and thus became useless/unused when the function macro got them. This restores the original intention, to align the loop entry points. Signed-off-by: Martin Storsjö --- libavutil/arm/asm.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavutil/arm/asm.S') diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index 463820015d..57efe977ed 100644 --- a/libavutil/arm/asm.S +++ b/libavutil/arm/asm.S @@ -54,7 +54,7 @@ T .thumb ELF .eabi_attribute 25, 1 @ Tag_ABI_align_preserved -.macro function name, export=0 +.macro function name, export=0, align=2 .set .Lpic_idx, 0 .set .Lpic_gp, 0 .macro endfunc @@ -69,7 +69,7 @@ ELF .size \name, . - \name .purgem endfunc .endm .text - .align 2 + .align \align .if \export .global EXTERN_ASM\name EXTERN_ASM\name: -- cgit v1.2.3