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