← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/firefox/oneiric-proposed

« back to all changes in this revision

Viewing changes to debian/patches/change-opt-back-to-Os.patch

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2011-08-01 20:41:31 UTC
  • mfrom: (1.1.45 upstream)
  • Revision ID: james.westby@ubuntu.com-20110801204131-4liom0bx36zg4hwm
Tags: 6.0~b4+build1+nobinonly-0ubuntu1
https://launchpad.net/bugs/810489
https://launchpad.net/bugs/800733
* New upstream release from the beta channel (FIREFOX_6_0b4_BUILD1)

* Update globalmenu-extension to 1.8
  - Update for imgILoader changes in Firefox 8
  - Fix LP: #810489 - Inconsistent behaviour if extension is enabled
    after turning off the menubar, which will affect Lucid -> P upgrades
    once Lucid has a newer Firefox. document.loadOverlay() triggers a reload
    of localstore.rdf, which overwrites our changes to the UI to hide
    the Firefox button and bookmark button. Restore them when this happens
  - Fix LP: #800733 - Quick Filter Bar checkbox in Thunderbird menu is
    not marked as checked. On menuitems with command nodes, ensure we update
    the state on the correct node
  - Ensure we disconnect all signal handlers when a menu is destroyed.
    Should fix a SIGSEGV in uGlobalMenu::OnClose()
* Drop a distro pref that should have gone a long time ago
  - update debian/vendor.js
* Remove patches fixed upstream
  - remove debian/patches/change-opt-back-to-Os.patch
  - update debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/change-opt-back-to-Os.patch
1
 
Description: On Linux, use -Os on normal builds and -O3 when PGO is enabled
2
 
Origin: http://hg.mozilla.org/mozilla-central/rev/0bf1fe7f9be1
3
 
Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=655003
4
 
 
5
 
--- a/config/autoconf.mk.in
6
 
+++ b/config/autoconf.mk.in
7
 
@@ -315,6 +315,7 @@ WARNINGS_AS_ERRORS = @WARNINGS_AS_ERRORS
8
 
 
9
 
 MOZ_OPTIMIZE   = @MOZ_OPTIMIZE@
10
 
 MOZ_OPTIMIZE_FLAGS = @MOZ_OPTIMIZE_FLAGS@
11
 
+MOZ_PGO_OPTIMIZE_FLAGS = @MOZ_PGO_OPTIMIZE_FLAGS@
12
 
 MOZ_OPTIMIZE_LDFLAGS = @MOZ_OPTIMIZE_LDFLAGS@
13
 
 MOZ_OPTIMIZE_SIZE_TWEAK = @MOZ_OPTIMIZE_SIZE_TWEAK@
14
 
 
15
 
--- a/config/config.mk
16
 
+++ b/config/config.mk
17
 
@@ -422,8 +422,13 @@ ifdef MODULE_OPTIMIZE_FLAGS
18
 
 CFLAGS         += $(MODULE_OPTIMIZE_FLAGS)
19
 
 CXXFLAGS       += $(MODULE_OPTIMIZE_FLAGS)
20
 
 else
21
 
+ifneq (,$(MOZ_PROFILE_GENERATE)$(MOZ_PROFILE_USE))
22
 
+CFLAGS         += $(MOZ_PGO_OPTIMIZE_FLAGS)
23
 
+CXXFLAGS       += $(MOZ_PGO_OPTIMIZE_FLAGS)
24
 
+else
25
 
 CFLAGS         += $(MOZ_OPTIMIZE_FLAGS)
26
 
 CXXFLAGS       += $(MOZ_OPTIMIZE_FLAGS)
27
 
+endif # neq (,$(MOZ_PROFILE_GENERATE)$(MOZ_PROFILE_USE))
28
 
 endif # MODULE_OPTIMIZE_FLAGS
29
 
 else
30
 
 CFLAGS         += $(MOZ_OPTIMIZE_FLAGS)
31
 
--- a/configure.in
32
 
+++ b/configure.in
33
 
@@ -2188,10 +2188,12 @@ ia64*-hpux*)
34
 
         esac
35
 
         # If we're building with --enable-profiling, we need a frame pointer.
36
 
         if test -z "$MOZ_PROFILING"; then
37
 
-            MOZ_OPTIMIZE_FLAGS="-O3 -fomit-frame-pointer"
38
 
+            MOZ_FRAMEPTR_FLAGS="-fomit-frame-pointer"
39
 
         else
40
 
-            MOZ_OPTIMIZE_FLAGS="-O3 -fno-omit-frame-pointer"
41
 
+            MOZ_FRAMEPTR_FLAGS="-fno-omit-frame-pointer"
42
 
         fi
43
 
+        MOZ_PGO_OPTIMIZE_FLAGS="-O3 $MOZ_FRAMEPTR_FLAGS"
44
 
+        MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks $MOZ_OPTIMIZE_SIZE_TWEAK $MOZ_FRAMEPTR_FLAGS"
45
 
         MOZ_DEBUG_FLAGS="-g"
46
 
     fi
47
 
 
48
 
@@ -7186,6 +7188,7 @@ AC_SUBST(MOZ_OPTIMIZE)
49
 
 AC_SUBST(MOZ_OPTIMIZE_FLAGS)
50
 
 AC_SUBST(MOZ_OPTIMIZE_LDFLAGS)
51
 
 AC_SUBST(MOZ_OPTIMIZE_SIZE_TWEAK)
52
 
+AC_SUBST(MOZ_PGO_OPTIMIZE_FLAGS)
53
 
 
54
 
 dnl ========================================================
55
 
 dnl = Enable generation of debug symbols
56
 
--- a/js/src/config/autoconf.mk.in
57
 
+++ b/js/src/config/autoconf.mk.in
58
 
@@ -145,6 +145,7 @@ FAIL_ON_WARNINGS = @FAIL_ON_WARNINGS@
59
 
 
60
 
 MOZ_OPTIMIZE   = @MOZ_OPTIMIZE@
61
 
 MOZ_OPTIMIZE_FLAGS = @MOZ_OPTIMIZE_FLAGS@
62
 
+MOZ_PGO_OPTIMIZE_FLAGS = @MOZ_PGO_OPTIMIZE_FLAGS@
63
 
 MOZ_OPTIMIZE_LDFLAGS = @MOZ_OPTIMIZE_LDFLAGS@
64
 
 MOZ_OPTIMIZE_SIZE_TWEAK = @MOZ_OPTIMIZE_SIZE_TWEAK@
65
 
 
66
 
--- a/js/src/config/config.mk
67
 
+++ b/js/src/config/config.mk
68
 
@@ -422,8 +422,13 @@ ifdef MODULE_OPTIMIZE_FLAGS
69
 
 CFLAGS         += $(MODULE_OPTIMIZE_FLAGS)
70
 
 CXXFLAGS       += $(MODULE_OPTIMIZE_FLAGS)
71
 
 else
72
 
+ifneq (,$(MOZ_PROFILE_GENERATE)$(MOZ_PROFILE_USE))
73
 
+CFLAGS         += $(MOZ_PGO_OPTIMIZE_FLAGS)
74
 
+CXXFLAGS       += $(MOZ_PGO_OPTIMIZE_FLAGS)
75
 
+else
76
 
 CFLAGS         += $(MOZ_OPTIMIZE_FLAGS)
77
 
 CXXFLAGS       += $(MOZ_OPTIMIZE_FLAGS)
78
 
+endif # neq (,$(MOZ_PROFILE_GENERATE)$(MOZ_PROFILE_USE))
79
 
 endif # MODULE_OPTIMIZE_FLAGS
80
 
 else
81
 
 CFLAGS         += $(MOZ_OPTIMIZE_FLAGS)
82
 
--- a/js/src/configure.in
83
 
+++ b/js/src/configure.in
84
 
@@ -2102,10 +2102,12 @@ ia64*-hpux*)
85
 
         esac
86
 
         # If we're building with --enable-profiling, we need a frame pointer.
87
 
         if test -z "$MOZ_PROFILING"; then
88
 
-            MOZ_OPTIMIZE_FLAGS="-O3 -fomit-frame-pointer"
89
 
+            MOZ_FRAMEPTR_FLAGS="-fomit-frame-pointer"
90
 
         else
91
 
-            MOZ_OPTIMIZE_FLAGS="-O3 -fno-omit-frame-pointer"
92
 
+            MOZ_FRAMEPTR_FLAGS="-fno-omit-frame-pointer"
93
 
         fi
94
 
+        MOZ_PGO_OPTIMIZE_FLAGS="-O3 $MOZ_FRAMEPTR_FLAGS"
95
 
+        MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks $MOZ_OPTIMIZE_SIZE_TWEAK $MOZ_FRAMEPTR_FLAGS"
96
 
         MOZ_DEBUG_FLAGS="-g"
97
 
     fi
98
 
 
99
 
@@ -4617,6 +4619,7 @@ AC_SUBST(MOZ_OPTIMIZE)
100
 
 AC_SUBST(MOZ_OPTIMIZE_FLAGS)
101
 
 AC_SUBST(MOZ_OPTIMIZE_LDFLAGS)
102
 
 AC_SUBST(MOZ_OPTIMIZE_SIZE_TWEAK)
103
 
+AC_SUBST(MOZ_PGO_OPTIMIZE_FLAGS)
104
 
 
105
 
 dnl ========================================================
106
 
 dnl = Enable generation of debug symbols
107
 
--- a/xpcom/io/Makefile.in
108
 
+++ b/xpcom/io/Makefile.in
109
 
@@ -51,7 +51,7 @@ MOZILLA_INTERNAL_API = 1
110
 
 # work around bug 408258
111
 
 ifdef GNU_CC 
112
 
 ifneq ($(OS_ARCH), Darwin)
113
 
-MODULE_OPTIMIZE_FLAGS = -O3 -fno-strict-aliasing
114
 
+MODULE_OPTIMIZE_FLAGS = $(MOZ_OPTIMIZE_FLAGS) -fno-strict-aliasing
115
 
 endif
116
 
 endif
117