equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 11d55dfd8e3a732ea60761b259e20790b0ecec43 |
2 # Parent 7bc8f0e5bed8cb2212e27228e628861737256459 |
3 Patch to make Mozilla build with gcc 4.7, including |
3 Patch to make Mozilla build with gcc 4.7, including |
4 - Bug 734490 - "no viable overloaded 'PRIxPTR'" when building with Clang or GCC 4.7 (TM: Mozilla14) |
4 - Bug 734490 - "no viable overloaded 'PRIxPTR'" when building with Clang or GCC 4.7 (TM: Mozilla14) |
|
5 - Bug 741348 - Work around crashreporter client build failure with gcc 4.7 (TM: Mozilla15) |
5 |
6 |
6 diff --git a/layout/base/tests/TestPoisonArea.cpp b/layout/base/tests/TestPoisonArea.cpp |
7 diff --git a/layout/base/tests/TestPoisonArea.cpp b/layout/base/tests/TestPoisonArea.cpp |
7 --- a/layout/base/tests/TestPoisonArea.cpp |
8 --- a/layout/base/tests/TestPoisonArea.cpp |
8 +++ b/layout/base/tests/TestPoisonArea.cpp |
9 +++ b/layout/base/tests/TestPoisonArea.cpp |
9 @@ -392,53 +392,53 @@ ReservePoisonArea() |
10 @@ -392,53 +392,53 @@ ReservePoisonArea() |
101 |
102 |
102 static void |
103 static void |
103 JumpTo(uintptr_t opaddr) |
104 JumpTo(uintptr_t opaddr) |
104 { |
105 { |
105 #ifdef __ia64 |
106 #ifdef __ia64 |
|
107 diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in |
|
108 --- a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in |
|
109 +++ b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in |
|
110 @@ -61,8 +61,11 @@ HOST_CPPSRCS = \ |
|
111 file_id.cc \ |
|
112 guid_creator.cc \ |
|
113 $(NULL) |
|
114 |
|
115 # need static lib |
|
116 FORCE_STATIC_LIB = 1 |
|
117 |
|
118 include $(topsrcdir)/config/rules.mk |
|
119 + |
|
120 +# See https://bugzilla.mozilla.org/show_bug.cgi?id=741348#c11 |
|
121 +file_id.$(OBJ_SUFFIX): STL_FLAGS= |