diff --git a/browser/build.mk b/browser/build.mk index f2b5b3cccd2..d1aceae5982 100644 --- a/browser/build.mk +++ b/browser/build.mk @@ -55,6 +55,22 @@ tier_app_dirs += browser # Never add other tier_app_dirs after browser. They won't get packaged # properly on mac. +################################################ +# Parallel build on Windows with GNU make check + +default:: +ifeq (,$(findstring pymake,$(MAKE))) +ifeq ($(HOST_OS_ARCH),WINNT) +ifneq (1,$(NUMBER_OF_PROCESSORS)) + @echo $(if $(findstring -j,$(value MAKEFLAGS)), \ +$(error You are using GNU make to build Firefox with -jN on Windows. \ +This will randomly deadlock. To compile a parallel build on Windows \ +run "python -OO build/pymake/make.py -f client.mk build". \ +See https://developer.mozilla.org/en/pymake for more details.)) +endif +endif +endif + installer: @$(MAKE) -C browser/installer installer diff --git a/toolkit/crashreporter/google-breakpad/Makefile.am b/toolkit/crashreporter/google-breakpad/Makefile.am index a31c5028aa6..85d18041cba 100644 --- a/toolkit/crashreporter/google-breakpad/Makefile.am +++ b/toolkit/crashreporter/google-breakpad/Makefile.am @@ -604,7 +604,7 @@ EXTRA_DIST = \ src/common/mac/macho_walker.h \ src/common/mac/string_utilities.cc \ src/common/mac/string_utilities.h \ - src/common/md5.c \ + src/common/md5.cc \ src/common/md5.h \ src/common/solaris/dump_symbols.cc \ src/common/solaris/dump_symbols.h \ diff --git a/toolkit/crashreporter/google-breakpad/Makefile.in b/toolkit/crashreporter/google-breakpad/Makefile.in index fba61601fc1..b3fa7c7351e 100644 --- a/toolkit/crashreporter/google-breakpad/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/Makefile.in @@ -633,7 +633,7 @@ EXTRA_DIST = \ src/common/mac/macho_walker.h \ src/common/mac/string_utilities.cc \ src/common/mac/string_utilities.h \ - src/common/md5.c \ + src/common/md5.cc \ src/common/md5.h \ src/common/solaris/dump_symbols.cc \ src/common/solaris/dump_symbols.h \ diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/minidump_test.xcodeproj/project.pbxproj b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/minidump_test.xcodeproj/project.pbxproj index b140a71a282..b414c0dbce5 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/minidump_test.xcodeproj/project.pbxproj +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/minidump_test.xcodeproj/project.pbxproj @@ -72,7 +72,7 @@ F93A88880E8B4C9A0026AF89 /* bytereader.cc in Sources */ = {isa = PBXBuildFile; fileRef = F9721F760E8B0DC700D7E813 /* bytereader.cc */; }; F93A88890E8B4C9A0026AF89 /* dwarf2reader.cc in Sources */ = {isa = PBXBuildFile; fileRef = F9721F770E8B0DC700D7E813 /* dwarf2reader.cc */; }; F93A888A0E8B4C9A0026AF89 /* functioninfo.cc in Sources */ = {isa = PBXBuildFile; fileRef = F9721F780E8B0DC700D7E813 /* functioninfo.cc */; }; - F93A888B0E8B4C9A0026AF89 /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = F9721FA80E8B0E4800D7E813 /* md5.c */; }; + F93A888B0E8B4C9A0026AF89 /* md5.cc in Sources */ = {isa = PBXBuildFile; fileRef = F9721FA80E8B0E4800D7E813 /* md5.cc */; }; F9721F6C0E8B0D7000D7E813 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9721F6B0E8B0D7000D7E813 /* Cocoa.framework */; }; F9721FA20E8B0E2300D7E813 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9721FA10E8B0E2300D7E813 /* SenTestingKit.framework */; }; F982089C0DB3280D0017AECA /* breakpad_nlist_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = F982089B0DB3280D0017AECA /* breakpad_nlist_test.cc */; }; @@ -157,7 +157,7 @@ F9721F770E8B0DC700D7E813 /* dwarf2reader.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dwarf2reader.cc; path = ../../../common/dwarf/dwarf2reader.cc; sourceTree = SOURCE_ROOT; }; F9721F780E8B0DC700D7E813 /* functioninfo.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = functioninfo.cc; path = ../../../common/dwarf/functioninfo.cc; sourceTree = SOURCE_ROOT; }; F9721FA10E8B0E2300D7E813 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; - F9721FA80E8B0E4800D7E813 /* md5.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = md5.c; path = ../../../common/md5.c; sourceTree = SOURCE_ROOT; }; + F9721FA80E8B0E4800D7E813 /* md5.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = md5.cc; path = ../../../common/md5.cc; sourceTree = SOURCE_ROOT; }; F982089A0DB3280D0017AECA /* breakpad_nlist_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = breakpad_nlist_test.h; sourceTree = ""; }; F982089B0DB3280D0017AECA /* breakpad_nlist_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = breakpad_nlist_test.cc; sourceTree = ""; }; F98208A10DB32CAE0017AECA /* breakpad_nlist_64.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = breakpad_nlist_64.cc; sourceTree = ""; }; @@ -236,7 +236,7 @@ 8BFC812011FF99D5002CB4DC /* Breakpad.xcconfig */, 8BFC812111FF99D5002CB4DC /* BreakpadDebug.xcconfig */, 8BFC812211FF99D5002CB4DC /* BreakpadRelease.xcconfig */, - F9721FA80E8B0E4800D7E813 /* md5.c */, + F9721FA80E8B0E4800D7E813 /* md5.cc */, F9721F760E8B0DC700D7E813 /* bytereader.cc */, F9721F770E8B0DC700D7E813 /* dwarf2reader.cc */, F9721F780E8B0DC700D7E813 /* functioninfo.cc */, @@ -594,7 +594,7 @@ F93A88880E8B4C9A0026AF89 /* bytereader.cc in Sources */, F93A88890E8B4C9A0026AF89 /* dwarf2reader.cc in Sources */, F93A888A0E8B4C9A0026AF89 /* functioninfo.cc in Sources */, - F93A888B0E8B4C9A0026AF89 /* md5.c in Sources */, + F93A888B0E8B4C9A0026AF89 /* md5.cc in Sources */, F93A887D0E8B4C8C0026AF89 /* macho_walker.cc in Sources */, F93A887E0E8B4C8C0026AF89 /* macho_id.cc in Sources */, F93A887F0E8B4C8C0026AF89 /* macho_utilities.cc in Sources */, diff --git a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in index ab50776f72a..c7f2a327f8e 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in @@ -53,11 +53,11 @@ endif CPPSRCS = \ string_conversion.cc \ + md5.cc \ $(NULL) CSRCS = \ convert_UTF.c \ - md5.c \ $(NULL) HOST_CPPSRCS = $(CPPSRCS) diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/macho_id.cc b/toolkit/crashreporter/google-breakpad/src/common/mac/macho_id.cc index 3fcffe4e166..759baf5e9d8 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/macho_id.cc +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/macho_id.cc @@ -52,6 +52,10 @@ extern "C" { // necessary for Leopard namespace MacFileUtilities { +using google_breakpad::MD5Init; +using google_breakpad::MD5Update; +using google_breakpad::MD5Final; + MachoID::MachoID(const char *path) : file_(0), crc_(0), diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/macho_id.h b/toolkit/crashreporter/google-breakpad/src/common/mac/macho_id.h index 9bcefc561eb..5ef973a17ee 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/macho_id.h +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/macho_id.h @@ -102,7 +102,7 @@ class MachoID { uint32_t crc_; // The MD5 context - MD5Context md5_context_; + google_breakpad::MD5Context md5_context_; // The current update to call from the Update callback UpdateFunction update_function_; diff --git a/toolkit/crashreporter/google-breakpad/src/common/md5.c b/toolkit/crashreporter/google-breakpad/src/common/md5.cc similarity index 99% rename from toolkit/crashreporter/google-breakpad/src/common/md5.c rename to toolkit/crashreporter/google-breakpad/src/common/md5.cc index 7fc198afe8f..b6e88e441bb 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/md5.c +++ b/toolkit/crashreporter/google-breakpad/src/common/md5.cc @@ -17,6 +17,8 @@ #include "common/md5.h" +namespace google_breakpad { + #ifndef WORDS_BIGENDIAN #define byteReverse(buf, len) /* Nothing */ #else @@ -244,3 +246,6 @@ static void MD5Transform(u32 buf[4], u32 const in[16]) buf[2] += c; buf[3] += d; } + +} // namespace google_breakpad + diff --git a/toolkit/crashreporter/google-breakpad/src/common/md5.h b/toolkit/crashreporter/google-breakpad/src/common/md5.h index dbf4893cd9a..e96521eedd0 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/md5.h +++ b/toolkit/crashreporter/google-breakpad/src/common/md5.h @@ -5,6 +5,8 @@ #include +namespace google_breakpad { + typedef uint32_t u32; typedef uint8_t u8; @@ -14,18 +16,12 @@ struct MD5Context { u8 in[64]; }; -#ifdef __cplusplus -extern "C" { -#endif // __cplusplus - void MD5Init(struct MD5Context *ctx); void MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len); void MD5Final(unsigned char digest[16], struct MD5Context *ctx); -#ifdef __cplusplus -} -#endif +} // namespace google_breakpad #endif // COMMON_MD5_H__ diff --git a/toolkit/crashreporter/google-breakpad/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj b/toolkit/crashreporter/google-breakpad/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj index abf9565a8ea..4b97f553307 100644 --- a/toolkit/crashreporter/google-breakpad/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj +++ b/toolkit/crashreporter/google-breakpad/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj @@ -408,6 +408,7 @@ baseConfigurationReference = 8B3102DA11F0D65600FCF3E4 /* BreakpadDebug.xcconfig */; buildSettings = { GCC_PREPROCESSOR_DEFINITIONS = HAVE_MACH_O_NLIST_H; + GCC_TREAT_WARNINGS_AS_ERRORS = NO; }; name = Debug; };