diff --git a/media/libvpx/build/make/ads2gas.pl b/media/libvpx/build/make/ads2gas.pl --- a/media/libvpx/build/make/ads2gas.pl +++ b/media/libvpx/build/make/ads2gas.pl @@ -74,17 +74,20 @@ while () # Convert INCLUDE to .INCLUDE "file" s/INCLUDE(\s*)(.*)$/.include $1\"$2\"/; # Code directive (ARM vs Thumb) s/CODE([0-9][0-9])/.code $1/; # No AREA required - s/^\s*AREA.*$/.text/; + # But ALIGNs in AREA must be obeyed + s/^\s*AREA.*ALIGN=([0-9])$/.text\n.p2align $1/; + # If no ALIGN, strip the AREA and align to 4 bytes + s/^\s*AREA.*$/.text\n.p2align 2/; # DCD to .word # This one is for incoming symbols s/DCD\s+\|(\w*)\|/.long $1/; # DCW to .short s/DCW\s+\|(\w*)\|/.short $1/; s/DCW(.*)/.short $1/;