equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent debab900e37fdd4f8981c06beef6f193a04bd2b7 |
2 # Parent 93e5d3b8061741abc83dcd4ed0fe93f1636583ef |
3 Patch to make Mozilla build with gcc 4.7, including |
3 Patch to make Mozilla build with gcc 4.7, including |
4 - Bug 725655 - gcc 4.7 build failures (missing headers) (TM: Mozilla13) |
4 - Bug 725655 - gcc 4.7 build failures (missing headers) (TM: Mozilla13) |
5 - Bug 734490 - "no viable overloaded 'PRIxPTR'" when building with Clang or GCC 4.7 (TM: Mozilla14) |
5 - Bug 734490 - "no viable overloaded 'PRIxPTR'" when building with Clang or GCC 4.7 (TM: Mozilla14) |
|
6 - Bug 741348 - Work around crashreporter client build failure with gcc 4.7 (TM: Mozilla15) |
6 |
7 |
7 diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc |
8 diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc |
8 --- a/ipc/chromium/src/base/file_util_linux.cc |
9 --- a/ipc/chromium/src/base/file_util_linux.cc |
9 +++ b/ipc/chromium/src/base/file_util_linux.cc |
10 +++ b/ipc/chromium/src/base/file_util_linux.cc |
10 @@ -1,15 +1,18 @@ |
11 @@ -1,15 +1,18 @@ |
170 |
171 |
171 static void |
172 static void |
172 JumpTo(uintptr_t opaddr) |
173 JumpTo(uintptr_t opaddr) |
173 { |
174 { |
174 #ifdef __ia64 |
175 #ifdef __ia64 |
|
176 diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in |
|
177 --- a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in |
|
178 +++ b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in |
|
179 @@ -61,8 +61,11 @@ HOST_CPPSRCS = \ |
|
180 file_id.cc \ |
|
181 guid_creator.cc \ |
|
182 $(NULL) |
|
183 |
|
184 # need static lib |
|
185 FORCE_STATIC_LIB = 1 |
|
186 |
|
187 include $(topsrcdir)/config/rules.mk |
|
188 + |
|
189 +# See https://bugzilla.mozilla.org/show_bug.cgi?id=741348#c11 |
|
190 +file_id.$(OBJ_SUFFIX): STL_FLAGS= |