media/libtheora/bug920992.patch

changeset 0
6474c204b198
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/media/libtheora/bug920992.patch	Wed Dec 31 06:09:35 2014 +0100
     1.3 @@ -0,0 +1,103 @@
     1.4 +diff --git a/media/libtheora/lib/arm/armbits.s b/media/libtheora/lib/arm/armbits.s
     1.5 +--- a/media/libtheora/lib/arm/armbits.s
     1.6 ++++ b/media/libtheora/lib/arm/armbits.s
     1.7 +@@ -12,16 +12,22 @@
     1.8 + ;
     1.9 + ; function:
    1.10 + ;   last mod: $Id: armbits.s 17481 2010-10-03 22:49:42Z tterribe $
    1.11 + ;
    1.12 + ;********************************************************************
    1.13 + 
    1.14 + 	AREA	|.text|, CODE, READONLY
    1.15 + 
    1.16 ++	; Explicitly specifying alignment here because some versions of
    1.17 ++	; gas don't align code correctly. See
    1.18 ++	; http://lists.gnu.org/archive/html/bug-binutils/2011-06/msg00199.html
    1.19 ++	; https://bugzilla.mozilla.org/show_bug.cgi?id=920992
    1.20 ++	ALIGN
    1.21 ++
    1.22 + 	EXPORT oc_pack_read_arm
    1.23 + 	EXPORT oc_pack_read1_arm
    1.24 + 	EXPORT oc_huff_token_decode_arm
    1.25 + 
    1.26 + oc_pack_read1_arm PROC
    1.27 + 	; r0 = oc_pack_buf *_b
    1.28 + 	ADD r12,r0,#8
    1.29 + 	LDMIA r12,{r2,r3}      ; r2 = window
    1.30 +diff --git a/media/libtheora/lib/arm/armfrag.s b/media/libtheora/lib/arm/armfrag.s
    1.31 +--- a/media/libtheora/lib/arm/armfrag.s
    1.32 ++++ b/media/libtheora/lib/arm/armfrag.s
    1.33 +@@ -11,16 +11,22 @@
    1.34 + ;********************************************************************
    1.35 + ; Original implementation:
    1.36 + ;  Copyright (C) 2009 Robin Watts for Pinknoise Productions Ltd
    1.37 + ; last mod: $Id: armfrag.s 17481 2010-10-03 22:49:42Z tterribe $
    1.38 + ;********************************************************************
    1.39 + 
    1.40 + 	AREA	|.text|, CODE, READONLY
    1.41 + 
    1.42 ++	; Explicitly specifying alignment here because some versions of
    1.43 ++	; gas don't align code correctly. See
    1.44 ++	; http://lists.gnu.org/archive/html/bug-binutils/2011-06/msg00199.html
    1.45 ++	; https://bugzilla.mozilla.org/show_bug.cgi?id=920992
    1.46 ++	ALIGN
    1.47 ++
    1.48 + 	GET	armopts.s
    1.49 + 
    1.50 + ; Vanilla ARM v4 versions
    1.51 + 	EXPORT	oc_frag_copy_list_arm
    1.52 + 	EXPORT	oc_frag_recon_intra_arm
    1.53 + 	EXPORT	oc_frag_recon_inter_arm
    1.54 + 	EXPORT	oc_frag_recon_inter2_arm
    1.55 + 
    1.56 +diff --git a/media/libtheora/lib/arm/armidct.s b/media/libtheora/lib/arm/armidct.s
    1.57 +--- a/media/libtheora/lib/arm/armidct.s
    1.58 ++++ b/media/libtheora/lib/arm/armidct.s
    1.59 +@@ -11,16 +11,22 @@
    1.60 + ;********************************************************************
    1.61 + ; Original implementation:
    1.62 + ;  Copyright (C) 2009 Robin Watts for Pinknoise Productions Ltd
    1.63 + ; last mod: $Id: armidct.s 17481 2010-10-03 22:49:42Z tterribe $
    1.64 + ;********************************************************************
    1.65 + 
    1.66 + 	AREA	|.text|, CODE, READONLY
    1.67 + 
    1.68 ++	; Explicitly specifying alignment here because some versions of
    1.69 ++	; gas don't align code correctly. See
    1.70 ++	; http://lists.gnu.org/archive/html/bug-binutils/2011-06/msg00199.html
    1.71 ++	; https://bugzilla.mozilla.org/show_bug.cgi?id=920992
    1.72 ++	ALIGN
    1.73 ++
    1.74 + 	GET	armopts.s
    1.75 + 
    1.76 + 	EXPORT	oc_idct8x8_1_arm
    1.77 + 	EXPORT	oc_idct8x8_arm
    1.78 + 
    1.79 + oc_idct8x8_1_arm PROC
    1.80 + 	; r0 = ogg_int16_t  *_y
    1.81 + 	; r1 = ogg_uint16_t  _dc
    1.82 +diff --git a/media/libtheora/lib/arm/armloop.s b/media/libtheora/lib/arm/armloop.s
    1.83 +--- a/media/libtheora/lib/arm/armloop.s
    1.84 ++++ b/media/libtheora/lib/arm/armloop.s
    1.85 +@@ -11,16 +11,22 @@
    1.86 + ;********************************************************************
    1.87 + ; Original implementation:
    1.88 + ;  Copyright (C) 2009 Robin Watts for Pinknoise Productions Ltd
    1.89 + ; last mod: $Id: armloop.s 17481 2010-10-03 22:49:42Z tterribe $
    1.90 + ;********************************************************************
    1.91 + 
    1.92 + 	AREA	|.text|, CODE, READONLY
    1.93 + 
    1.94 ++	; Explicitly specifying alignment here because some versions of
    1.95 ++	; gas don't align code correctly. See
    1.96 ++	; http://lists.gnu.org/archive/html/bug-binutils/2011-06/msg00199.html
    1.97 ++	; https://bugzilla.mozilla.org/show_bug.cgi?id=920992
    1.98 ++	ALIGN
    1.99 ++
   1.100 + 	GET	armopts.s
   1.101 + 
   1.102 + 	EXPORT	oc_loop_filter_frag_rows_arm
   1.103 + 
   1.104 + ; Which bit this is depends on the order of packing within a bitfield.
   1.105 + ; Hopefully that doesn't change among any of the relevant compilers.
   1.106 + OC_FRAG_CODED_FLAG	*	1

mercurial