Merge lp:~rsalveti/firefox/natty-fix-thumb2 into lp:~mozillateam/firefox/firefox.natty

Proposed by Ricardo Salveti on 2011-06-26
Status: Rejected
Rejected by: Micah Gersten on 2011-09-23
Proposed branch: lp:~rsalveti/firefox/natty-fix-thumb2
Merge into: lp:~mozillateam/firefox/firefox.natty
Diff against target: 101 lines (+81/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/firefox-webm-thumb2-fix.patch (+73/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~rsalveti/firefox/natty-fix-thumb2
Reviewer Review Type Date Requested Status
Micah Gersten 2011-06-26 Disapprove on 2011-09-23
Review via email: mp+65922@code.launchpad.net

Description of the change

Including patch debian/patches/firefox-webm-thumb2-fix.patch:
Description: Enforce alignment for ARM code in Thumb mode in libvpx.
Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=666931
Forwarded: Yes, and already upstream.

Patch already applied upstream, at http://hg.mozilla.org/mozilla-central/rev/938c253f031c

To post a comment you must log in.
857. By Micah Gersten on 2011-06-28

No change rebuild to pick up LP: #800857 on armel and powerpc

858. By Micah Gersten on 2011-06-28

releasing version 5.0+build1+nobinonly-0ubuntu0.11.04.3

859. By Ricardo Salveti on 2011-07-06

* debian/patches/firefox-webm-thumb2-fix.patch:
  - Fix to make webm work when build with thumb2 support (LP: #789198)

Micah Gersten (micahg) wrote :

Thanks, but Firefox 7 comes out on Tuesday, so we won't be respinning for this alone, I've added the bug to my changelog for Firefox 7.

review: Disapprove

Unmerged revisions

859. By Ricardo Salveti on 2011-07-06

* debian/patches/firefox-webm-thumb2-fix.patch:
  - Fix to make webm work when build with thumb2 support (LP: #789198)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-06-28 22:45:31 +0000
3+++ debian/changelog 2011-07-06 23:52:42 +0000
4@@ -1,3 +1,10 @@
5+firefox (5.0+build1+nobinonly-0ubuntu0.11.04.4) UNRELEASED; urgency=low
6+
7+ * debian/patches/firefox-webm-thumb2-fix.patch:
8+ - Fix to make webm work when build with thumb2 support (LP: #789198)
9+
10+ -- Ricardo Salveti de Araujo <ricardo.salveti@linaro.org> Fri, 24 Jun 2011 17:43:08 -0300
11+
12 firefox (5.0+build1+nobinonly-0ubuntu0.11.04.3) natty-security; urgency=low
13
14 * No change rebuild to pick up LP: #800857 on armel and powerpc
15
16=== added file 'debian/patches/firefox-webm-thumb2-fix.patch'
17--- debian/patches/firefox-webm-thumb2-fix.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/firefox-webm-thumb2-fix.patch 2011-07-06 23:52:42 +0000
19@@ -0,0 +1,73 @@
20+
21+# HG changeset patch
22+# User Timothy B. Terriberry <tterribe@vt.edu>
23+# Date 1309201530 25200
24+# Node ID 938c253f031cdffd490289d134f704570bc39400
25+# Parent 45aa79639b58b88210529f05ce40e0dca747fbba
26+Bug 666931 - Enforce alignment for ARM code in Thumb mode in libvpx. r=cpearce
27+
28+diff --git a/media/libvpx/bug666931.patch b/media/libvpx/bug666931.patch
29+new file mode 100644
30+--- /dev/null
31++++ b/media/libvpx/bug666931.patch
32+@@ -0,0 +1,25 @@
33++diff --git a/media/libvpx/build/make/ads2gas.pl b/media/libvpx/build/make/ads2gas.pl
34++--- a/media/libvpx/build/make/ads2gas.pl
35+++++ b/media/libvpx/build/make/ads2gas.pl
36++@@ -74,17 +74,20 @@ while (<STDIN>)
37++
38++ # Convert INCLUDE to .INCLUDE "file"
39++ s/INCLUDE(\s*)(.*)$/.include $1\"$2\"/;
40++
41++ # Code directive (ARM vs Thumb)
42++ s/CODE([0-9][0-9])/.code $1/;
43++
44++ # No AREA required
45++- s/^\s*AREA.*$/.text/;
46+++ # But ALIGNs in AREA must be obeyed
47+++ s/^\s*AREA.*ALIGN=([0-9])$/.text\n.p2align $1/;
48+++ # If no ALIGN, strip the AREA and align to 4 bytes
49+++ s/^\s*AREA.*$/.text\n.p2align 2/;
50++
51++ # DCD to .word
52++ # This one is for incoming symbols
53++ s/DCD\s+\|(\w*)\|/.long $1/;
54++
55++ # DCW to .short
56++ s/DCW\s+\|(\w*)\|/.short $1/;
57++ s/DCW(.*)/.short $1/;
58+diff --git a/media/libvpx/build/make/ads2gas.pl b/media/libvpx/build/make/ads2gas.pl
59+--- a/media/libvpx/build/make/ads2gas.pl
60++++ b/media/libvpx/build/make/ads2gas.pl
61+@@ -74,17 +74,20 @@ while (<STDIN>)
62+
63+ # Convert INCLUDE to .INCLUDE "file"
64+ s/INCLUDE(\s*)(.*)$/.include $1\"$2\"/;
65+
66+ # Code directive (ARM vs Thumb)
67+ s/CODE([0-9][0-9])/.code $1/;
68+
69+ # No AREA required
70+- s/^\s*AREA.*$/.text/;
71++ # But ALIGNs in AREA must be obeyed
72++ s/^\s*AREA.*ALIGN=([0-9])$/.text\n.p2align $1/;
73++ # If no ALIGN, strip the AREA and align to 4 bytes
74++ s/^\s*AREA.*$/.text\n.p2align 2/;
75+
76+ # DCD to .word
77+ # This one is for incoming symbols
78+ s/DCD\s+\|(\w*)\|/.long $1/;
79+
80+ # DCW to .short
81+ s/DCW\s+\|(\w*)\|/.short $1/;
82+ s/DCW(.*)/.short $1/;
83+diff --git a/media/libvpx/update.sh b/media/libvpx/update.sh
84+--- a/media/libvpx/update.sh
85++++ b/media/libvpx/update.sh
86+@@ -323,3 +323,6 @@
87+
88+ # Patch to fix data race on global function pointers
89+ patch -p1 < bug640935.patch
90++
91++# Patch to fix alignment problems with using ARM asm in Thumb mode.
92++patch -p3 < bug666931.patch
93
94=== modified file 'debian/patches/series'
95--- debian/patches/series 2011-06-10 13:18:29 +0000
96+++ debian/patches/series 2011-07-06 23:52:42 +0000
97@@ -20,3 +20,4 @@
98 fix-selection-drag-autoscroll.patch
99 ubuntu-codes-baidu.patch
100 powerpc-build-fix.patch
101+firefox-webm-thumb2-fix.patch

Subscribers

People subscribed via source and target branches