media/libtheora/bug920992.patch@b8a032363ba2 (annotated)
media/libtheora/bug920992.patch
Thu, 22 Jan 2015 13:21:57 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 22 Jan 2015 13:21:57 +0100
- branch
- TOR_BUG_9701
- changeset 15
- b8a032363ba2
- permissions
- -rw-r--r--
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
| michael@0 | 1 | diff --git a/media/libtheora/lib/arm/armbits.s b/media/libtheora/lib/arm/armbits.s |
| michael@0 | 2 | --- a/media/libtheora/lib/arm/armbits.s |
| michael@0 | 3 | +++ b/media/libtheora/lib/arm/armbits.s |
| michael@0 | 4 | @@ -12,16 +12,22 @@ |
| michael@0 | 5 | ; |
| michael@0 | 6 | ; function: |
| michael@0 | 7 | ; last mod: $Id: armbits.s 17481 2010-10-03 22:49:42Z tterribe $ |
| michael@0 | 8 | ; |
| michael@0 | 9 | ;******************************************************************** |
| michael@0 | 10 | |
| michael@0 | 11 | AREA |.text|, CODE, READONLY |
| michael@0 | 12 | |
| michael@0 | 13 | + ; Explicitly specifying alignment here because some versions of |
| michael@0 | 14 | + ; gas don't align code correctly. See |
| michael@0 | 15 | + ; http://lists.gnu.org/archive/html/bug-binutils/2011-06/msg00199.html |
| michael@0 | 16 | + ; https://bugzilla.mozilla.org/show_bug.cgi?id=920992 |
| michael@0 | 17 | + ALIGN |
| michael@0 | 18 | + |
| michael@0 | 19 | EXPORT oc_pack_read_arm |
| michael@0 | 20 | EXPORT oc_pack_read1_arm |
| michael@0 | 21 | EXPORT oc_huff_token_decode_arm |
| michael@0 | 22 | |
| michael@0 | 23 | oc_pack_read1_arm PROC |
| michael@0 | 24 | ; r0 = oc_pack_buf *_b |
| michael@0 | 25 | ADD r12,r0,#8 |
| michael@0 | 26 | LDMIA r12,{r2,r3} ; r2 = window |
| michael@0 | 27 | diff --git a/media/libtheora/lib/arm/armfrag.s b/media/libtheora/lib/arm/armfrag.s |
| michael@0 | 28 | --- a/media/libtheora/lib/arm/armfrag.s |
| michael@0 | 29 | +++ b/media/libtheora/lib/arm/armfrag.s |
| michael@0 | 30 | @@ -11,16 +11,22 @@ |
| michael@0 | 31 | ;******************************************************************** |
| michael@0 | 32 | ; Original implementation: |
| michael@0 | 33 | ; Copyright (C) 2009 Robin Watts for Pinknoise Productions Ltd |
| michael@0 | 34 | ; last mod: $Id: armfrag.s 17481 2010-10-03 22:49:42Z tterribe $ |
| michael@0 | 35 | ;******************************************************************** |
| michael@0 | 36 | |
| michael@0 | 37 | AREA |.text|, CODE, READONLY |
| michael@0 | 38 | |
| michael@0 | 39 | + ; Explicitly specifying alignment here because some versions of |
| michael@0 | 40 | + ; gas don't align code correctly. See |
| michael@0 | 41 | + ; http://lists.gnu.org/archive/html/bug-binutils/2011-06/msg00199.html |
| michael@0 | 42 | + ; https://bugzilla.mozilla.org/show_bug.cgi?id=920992 |
| michael@0 | 43 | + ALIGN |
| michael@0 | 44 | + |
| michael@0 | 45 | GET armopts.s |
| michael@0 | 46 | |
| michael@0 | 47 | ; Vanilla ARM v4 versions |
| michael@0 | 48 | EXPORT oc_frag_copy_list_arm |
| michael@0 | 49 | EXPORT oc_frag_recon_intra_arm |
| michael@0 | 50 | EXPORT oc_frag_recon_inter_arm |
| michael@0 | 51 | EXPORT oc_frag_recon_inter2_arm |
| michael@0 | 52 | |
| michael@0 | 53 | diff --git a/media/libtheora/lib/arm/armidct.s b/media/libtheora/lib/arm/armidct.s |
| michael@0 | 54 | --- a/media/libtheora/lib/arm/armidct.s |
| michael@0 | 55 | +++ b/media/libtheora/lib/arm/armidct.s |
| michael@0 | 56 | @@ -11,16 +11,22 @@ |
| michael@0 | 57 | ;******************************************************************** |
| michael@0 | 58 | ; Original implementation: |
| michael@0 | 59 | ; Copyright (C) 2009 Robin Watts for Pinknoise Productions Ltd |
| michael@0 | 60 | ; last mod: $Id: armidct.s 17481 2010-10-03 22:49:42Z tterribe $ |
| michael@0 | 61 | ;******************************************************************** |
| michael@0 | 62 | |
| michael@0 | 63 | AREA |.text|, CODE, READONLY |
| michael@0 | 64 | |
| michael@0 | 65 | + ; Explicitly specifying alignment here because some versions of |
| michael@0 | 66 | + ; gas don't align code correctly. See |
| michael@0 | 67 | + ; http://lists.gnu.org/archive/html/bug-binutils/2011-06/msg00199.html |
| michael@0 | 68 | + ; https://bugzilla.mozilla.org/show_bug.cgi?id=920992 |
| michael@0 | 69 | + ALIGN |
| michael@0 | 70 | + |
| michael@0 | 71 | GET armopts.s |
| michael@0 | 72 | |
| michael@0 | 73 | EXPORT oc_idct8x8_1_arm |
| michael@0 | 74 | EXPORT oc_idct8x8_arm |
| michael@0 | 75 | |
| michael@0 | 76 | oc_idct8x8_1_arm PROC |
| michael@0 | 77 | ; r0 = ogg_int16_t *_y |
| michael@0 | 78 | ; r1 = ogg_uint16_t _dc |
| michael@0 | 79 | diff --git a/media/libtheora/lib/arm/armloop.s b/media/libtheora/lib/arm/armloop.s |
| michael@0 | 80 | --- a/media/libtheora/lib/arm/armloop.s |
| michael@0 | 81 | +++ b/media/libtheora/lib/arm/armloop.s |
| michael@0 | 82 | @@ -11,16 +11,22 @@ |
| michael@0 | 83 | ;******************************************************************** |
| michael@0 | 84 | ; Original implementation: |
| michael@0 | 85 | ; Copyright (C) 2009 Robin Watts for Pinknoise Productions Ltd |
| michael@0 | 86 | ; last mod: $Id: armloop.s 17481 2010-10-03 22:49:42Z tterribe $ |
| michael@0 | 87 | ;******************************************************************** |
| michael@0 | 88 | |
| michael@0 | 89 | AREA |.text|, CODE, READONLY |
| michael@0 | 90 | |
| michael@0 | 91 | + ; Explicitly specifying alignment here because some versions of |
| michael@0 | 92 | + ; gas don't align code correctly. See |
| michael@0 | 93 | + ; http://lists.gnu.org/archive/html/bug-binutils/2011-06/msg00199.html |
| michael@0 | 94 | + ; https://bugzilla.mozilla.org/show_bug.cgi?id=920992 |
| michael@0 | 95 | + ALIGN |
| michael@0 | 96 | + |
| michael@0 | 97 | GET armopts.s |
| michael@0 | 98 | |
| michael@0 | 99 | EXPORT oc_loop_filter_frag_rows_arm |
| michael@0 | 100 | |
| michael@0 | 101 | ; Which bit this is depends on the order of packing within a bitfield. |
| michael@0 | 102 | ; Hopefully that doesn't change among any of the relevant compilers. |
| michael@0 | 103 | OC_FRAG_CODED_FLAG * 1 |
