diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-08 05:36:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-08 05:36:56 +0100 |
| commit | edba54630b6f6157802a167d04d4da4c33f52d72 (patch) | |
| tree | 7a8ad554a75e4a93397412c715c34d2b2f53e082 /libavutil/arm/asm.S | |
| parent | 3c00d4c5f0ae855981a0cf8addfae0c948414625 (diff) | |
| parent | 5dae4872357613a0b51120b54a4c5221e0ec3f69 (diff) | |
| download | ffmpeg-edba54630b6f6157802a167d04d4da4c33f52d72.tar.gz | |
Merge commit '5dae4872357613a0b51120b54a4c5221e0ec3f69'
* commit '5dae4872357613a0b51120b54a4c5221e0ec3f69':
arm: Allow overriding the alignment set in the function macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm/asm.S')
| -rw-r--r-- | libavutil/arm/asm.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index 9cdcce9a18..c71c5753f6 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: |