bug 779291 - Breakpad Makefile changes. r=glandium

build/unix/stdc++compat/stdc++compat.cpp

@@ -34,6 +34,7 @@ namespace std {
     template istream& istream::_M_extract(unsigned int&);
     template istream& istream::_M_extract(unsigned long&);
     template istream& istream::_M_extract(unsigned short&);
+    template istream& istream::_M_extract(unsigned long long&);
 #endif
 #if MOZ_LIBSTDCXX_VERSION >= GLIBCXX_VERSION(3, 4, 14)
     /* Instantiate these templates to avoid GLIBCXX_3.4.14 symbol versions

toolkit/crashreporter/google-breakpad/src/common/Makefile.in

@@ -11,15 +11,54 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= breakpad_common
 LIBRARY_NAME	= breakpad_common_s
+ifneq (WINNT,$(OS_TARGET))
 HOST_LIBRARY_NAME = host_breakpad_common_s
+endif
 
 LOCAL_INCLUDES 	= -I$(srcdir)/..
 
 CPPSRCS	= \
-  md5.cc \
   string_conversion.cc \
+  module.cc \
+  unique_string.cc \
   $(NULL)
 
+ifneq (WINNT,$(OS_TARGET))
+CPPSRCS += \
+  md5.cc \
+  dwarf/bytereader.cc \
+  dwarf_cfi_to_module.cc \
+  dwarf/dwarf2reader.cc \
+  dwarf_cu_to_module.cc \
+  language.cc \
+  dwarf/dwarf2diehandler.cc \
+  dwarf_line_to_module.cc \
+  $(NULL)
+HOST_CPPSRCS = \
+  string_conversion.cc \
+  module.cc \
+  unique_string.cc \
+  md5.cc \
+  dwarf_cfi_to_module.cc \
+  dwarf_cu_to_module.cc \
+  language.cc \
+  stabs_to_module.cc \
+  stabs_reader.cc \
+  dwarf_line_to_module.cc \
+  $(NULL)
+endif
+
+ifeq ($(OS_ARCH),Linux)
+CPPSRCS += \
+  linux/dump_symbols.cc \
+  linux/elf_symbols_to_module.cc
+endif
+
+ifeq ($(OS_ARCH),Darwin)
+CMMSRCS += \
+  mac/dump_syms.mm
+endif
+
 CSRCS = \
   convert_UTF.c \
   $(NULL)
@@ -30,17 +69,11 @@ SSRCS := breakpad_getcontext.S
 TARGET_LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include/
 endif
 
-HOST_CPPSRCS = $(CPPSRCS)
-HOST_CPPSRCS += \
-  dwarf_cfi_to_module.cc \
-  dwarf_cu_to_module.cc \
-  dwarf_line_to_module.cc \
-  language.cc \
-  module.cc \
-  stabs_reader.cc \
-  stabs_to_module.cc \
-  unique_string.cc \
-  $(NULL)
+ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
+DEFINES += -DELFSIZE=32
+endif
+
+DEFINES += -DNO_STABS_SUPPORT
 
 ifdef MOZ_PLATFORM_MAEMO
 # The GCC in scratchbox crashes writing DWARF debug info for language.cc.
@@ -57,14 +90,18 @@ ifeq (Darwin,$(OS_ARCH))
 HOST_CXXFLAGS += -DHAVE_MACH_O_NLIST_H
 endif
 
+ifneq (WINNT,$(OS_TARGET))
 HOST_CSRCS = $(CSRCS)
+endif
 
 # need static lib
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
+ifneq (WINNT,$(OS_TARGET))
 # Headers from this directory are included as "common/header.h". Having
 # -I$(srcdir) on the command line makes us use common/memory.h when
 # <memory.h> is included from system headers, which is not intended.
 INCLUDES = $(LOCAL_INCLUDES) -I$(DIST)/include
+endif

toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in

@@ -36,6 +36,8 @@ ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 DEFINES += -DELFSIZE=32
 endif
 
+DEFINES += -DNO_STABS_SUPPORT
+
 HOST_CPPSRCS = \
   dump_symbols.cc \
   elf_symbols_to_module.cc \

toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in

@@ -43,6 +43,8 @@ HOST_CMMSRCS = \
   dump_syms.mm \
   $(NULL)
 
+DEFINES += -DNO_STABS_SUPPORT
+
 # need static lib
 FORCE_STATIC_LIB = 1
 

toolkit/crashreporter/google-breakpad/src/processor/Makefile.in

@@ -0,0 +1,45 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DEPTH		= @DEPTH@
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= breakpad_sps_common
+LIBRARY_NAME	= breakpad_sps_common_s
+HOST_LIBRARY_NAME = host_breakpad_sps_common_s
+
+LOCAL_INCLUDES 	= -I$(srcdir)/../.. -I$(srcdir)/..
+
+CPPSRCS	= \
+  stackwalker.cc \
+  stackwalker_amd64.cc \
+  stackwalker_arm.cc \
+  stackwalker_ppc.cc \
+  stackwalker_x86.cc \
+  stackwalker_sparc.cc \
+  minidump.cc \
+  basic_source_line_resolver.cc \
+  basic_code_modules.cc \
+  cfi_frame_info.cc \
+  call_stack.cc \
+  logging.cc \
+  pathname_stripper.cc \
+  tokenize.cc \
+  source_line_resolver_base.cc \
+  stack_frame_symbolizer.cc \
+  $(NULL)
+
+HOST_CPPSRCS = \
+  logging.cc \
+  pathname_stripper.cc \
+  $(NULL)
+
+# need static lib
+FORCE_STATIC_LIB = 1
+
+include $(topsrcdir)/config/rules.mk

toolkit/crashreporter/google-breakpad/src/processor/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

toolkit/crashreporter/moz.build

@@ -4,7 +4,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['OS_ARCH'] == 'WINNT':
-    DIRS += ['breakpad-windows-libxul']
+    DIRS += [
+    'google-breakpad/src/common',
+    'google-breakpad/src/processor',
+    'breakpad-windows-libxul'
+    ]
 
     if CONFIG['MOZ_CRASHREPORTER_INJECTOR']:
         DIRS += ['breakpad-windows-standalone']
@@ -16,6 +20,7 @@ elif CONFIG['OS_ARCH'] == 'Darwin':
         'google-breakpad/src/client',
         'google-breakpad/src/client/mac/crash_generation',
         'google-breakpad/src/client/mac/handler',
+        'google-breakpad/src/processor',
         'google-breakpad/src/tools/mac/dump_syms',
     ]
 
@@ -27,6 +32,7 @@ elif CONFIG['OS_ARCH'] == 'Linux':
         'google-breakpad/src/client/linux/crash_generation',
         'google-breakpad/src/client/linux/handler',
         'google-breakpad/src/client/linux/minidump_writer',
+        'google-breakpad/src/processor',
         'google-breakpad/src/tools/linux/dump_syms',
     ]
 

toolkit/xre/Makefile.in

@@ -132,6 +132,17 @@ SHARED_LIBRARY_LIBS += $(DEPTH)/toolkit/crashreporter/$(LIB_PREFIX)exception_han
 ifeq ($(OS_ARCH),WINNT)
 SHARED_LIBRARY_LIBS += \
   $(DEPTH)/toolkit/crashreporter/breakpad-windows-libxul/$(LIB_PREFIX)google_breakpad_libxul_s.$(LIB_SUFFIX)
+ifdef MOZ_ENABLE_PROFILER_SPS
+SHARED_LIBRARY_LIBS += \
+  $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \
+  $(NULL)
+endif
+endif
+
+ifdef MOZ_ENABLE_PROFILER_SPS
+SHARED_LIBRARY_LIBS += \
+  $(DEPTH)/toolkit/crashreporter/google-breakpad/src/processor/$(LIB_PREFIX)breakpad_sps_common_s.$(LIB_SUFFIX) \
+  $(NULL)
 endif
 
 ifeq ($(OS_ARCH),Darwin)