michael@0: diff --git a/media/libtheora/lib/arm/armbits.s b/media/libtheora/lib/arm/armbits.s
michael@0: --- a/media/libtheora/lib/arm/armbits.s
michael@0: +++ b/media/libtheora/lib/arm/armbits.s
michael@0: @@ -12,16 +12,22 @@
michael@0:  ;
michael@0:  ; function:
michael@0:  ;   last mod: $Id: armbits.s 17481 2010-10-03 22:49:42Z tterribe $
michael@0:  ;
michael@0:  ;********************************************************************
michael@0:  
michael@0:  	AREA	|.text|, CODE, READONLY
michael@0:  
michael@0: +	; Explicitly specifying alignment here because some versions of
michael@0: +	; gas don't align code correctly. See
michael@0: +	; http://lists.gnu.org/archive/html/bug-binutils/2011-06/msg00199.html
michael@0: +	; https://bugzilla.mozilla.org/show_bug.cgi?id=920992
michael@0: +	ALIGN
michael@0: +
michael@0:  	EXPORT oc_pack_read_arm
michael@0:  	EXPORT oc_pack_read1_arm
michael@0:  	EXPORT oc_huff_token_decode_arm
michael@0:  
michael@0:  oc_pack_read1_arm PROC
michael@0:  	; r0 = oc_pack_buf *_b
michael@0:  	ADD r12,r0,#8
michael@0:  	LDMIA r12,{r2,r3}      ; r2 = window
michael@0: diff --git a/media/libtheora/lib/arm/armfrag.s b/media/libtheora/lib/arm/armfrag.s
michael@0: --- a/media/libtheora/lib/arm/armfrag.s
michael@0: +++ b/media/libtheora/lib/arm/armfrag.s
michael@0: @@ -11,16 +11,22 @@
michael@0:  ;********************************************************************
michael@0:  ; Original implementation:
michael@0:  ;  Copyright (C) 2009 Robin Watts for Pinknoise Productions Ltd
michael@0:  ; last mod: $Id: armfrag.s 17481 2010-10-03 22:49:42Z tterribe $
michael@0:  ;********************************************************************
michael@0:  
michael@0:  	AREA	|.text|, CODE, READONLY
michael@0:  
michael@0: +	; Explicitly specifying alignment here because some versions of
michael@0: +	; gas don't align code correctly. See
michael@0: +	; http://lists.gnu.org/archive/html/bug-binutils/2011-06/msg00199.html
michael@0: +	; https://bugzilla.mozilla.org/show_bug.cgi?id=920992
michael@0: +	ALIGN
michael@0: +
michael@0:  	GET	armopts.s
michael@0:  
michael@0:  ; Vanilla ARM v4 versions
michael@0:  	EXPORT	oc_frag_copy_list_arm
michael@0:  	EXPORT	oc_frag_recon_intra_arm
michael@0:  	EXPORT	oc_frag_recon_inter_arm
michael@0:  	EXPORT	oc_frag_recon_inter2_arm
michael@0:  
michael@0: diff --git a/media/libtheora/lib/arm/armidct.s b/media/libtheora/lib/arm/armidct.s
michael@0: --- a/media/libtheora/lib/arm/armidct.s
michael@0: +++ b/media/libtheora/lib/arm/armidct.s
michael@0: @@ -11,16 +11,22 @@
michael@0:  ;********************************************************************
michael@0:  ; Original implementation:
michael@0:  ;  Copyright (C) 2009 Robin Watts for Pinknoise Productions Ltd
michael@0:  ; last mod: $Id: armidct.s 17481 2010-10-03 22:49:42Z tterribe $
michael@0:  ;********************************************************************
michael@0:  
michael@0:  	AREA	|.text|, CODE, READONLY
michael@0:  
michael@0: +	; Explicitly specifying alignment here because some versions of
michael@0: +	; gas don't align code correctly. See
michael@0: +	; http://lists.gnu.org/archive/html/bug-binutils/2011-06/msg00199.html
michael@0: +	; https://bugzilla.mozilla.org/show_bug.cgi?id=920992
michael@0: +	ALIGN
michael@0: +
michael@0:  	GET	armopts.s
michael@0:  
michael@0:  	EXPORT	oc_idct8x8_1_arm
michael@0:  	EXPORT	oc_idct8x8_arm
michael@0:  
michael@0:  oc_idct8x8_1_arm PROC
michael@0:  	; r0 = ogg_int16_t  *_y
michael@0:  	; r1 = ogg_uint16_t  _dc
michael@0: diff --git a/media/libtheora/lib/arm/armloop.s b/media/libtheora/lib/arm/armloop.s
michael@0: --- a/media/libtheora/lib/arm/armloop.s
michael@0: +++ b/media/libtheora/lib/arm/armloop.s
michael@0: @@ -11,16 +11,22 @@
michael@0:  ;********************************************************************
michael@0:  ; Original implementation:
michael@0:  ;  Copyright (C) 2009 Robin Watts for Pinknoise Productions Ltd
michael@0:  ; last mod: $Id: armloop.s 17481 2010-10-03 22:49:42Z tterribe $
michael@0:  ;********************************************************************
michael@0:  
michael@0:  	AREA	|.text|, CODE, READONLY
michael@0:  
michael@0: +	; Explicitly specifying alignment here because some versions of
michael@0: +	; gas don't align code correctly. See
michael@0: +	; http://lists.gnu.org/archive/html/bug-binutils/2011-06/msg00199.html
michael@0: +	; https://bugzilla.mozilla.org/show_bug.cgi?id=920992
michael@0: +	ALIGN
michael@0: +
michael@0:  	GET	armopts.s
michael@0:  
michael@0:  	EXPORT	oc_loop_filter_frag_rows_arm
michael@0:  
michael@0:  ; Which bit this is depends on the order of packing within a bitfield.
michael@0:  ; Hopefully that doesn't change among any of the relevant compilers.
michael@0:  OC_FRAG_CODED_FLAG	*	1