bug 548113 - Sync to Breakpad revision 554. Local Makefile changes. r=jimb
authorTed Mielczarek <ted.mielczarek@gmail.com>
Wed, 17 Mar 2010 11:57:25 -0400
changeset 39658 758ed71fe5fcf358d5122f52d0fc45ce60a4d068
parent 39657 df8d581bf4793839d3fdcfeb45ee8679ba76fe24
child 39659 339565aa8cfc76156dc0a5f37d34bf20079789c1
push idunknown
push userunknown
push dateunknown
reviewersjimb
bugs548113
milestone1.9.3a4pre
bug 548113 - Sync to Breakpad revision 554. Local Makefile changes. r=jimb
configure.in
toolkit/crashreporter/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
--- a/configure.in
+++ b/configure.in
@@ -1126,16 +1126,19 @@ HOST_OS_ARCH=`echo $host_os | sed -e 's|
 # OS_RELEASE
 # OS_MINOR_RELEASE
 #
 
 case "$HOST_OS_ARCH" in
 cygwin*|mingw*|mks*|msvc*)
     HOST_OS_ARCH=WINNT
     ;;
+darwin*)
+    HOST_OS_ARCH=Darwin
+    ;;
 linux*)
     HOST_OS_ARCH=Linux
     ;;
 solaris*)
     HOST_OS_ARCH=SunOS
     SOLARIS_SUNPRO_CC=
     SOLARIS_SUNPRO_CXX=
     if test -z "$GNU_CC"; then
--- a/toolkit/crashreporter/Makefile.in
+++ b/toolkit/crashreporter/Makefile.in
@@ -40,20 +40,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = crashreporter
 LIBXUL_LIBRARY = 1
 LIBRARY_NAME = exception_handler_s
 
-
-DIRS = \
-	$(NULL)
-
 ifeq  ($(OS_ARCH),WINNT)
 DIRS += \
   google-breakpad/src/common/windows \
   google-breakpad/src/client/windows/handler \
   google-breakpad/src/client/windows/sender \
   google-breakpad/src/client/windows/crash_generation \
   $(NULL)
 endif
--- a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
@@ -42,17 +42,17 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= breakpad_common
 LIBRARY_NAME	= breakpad_common_s
 HOST_LIBRARY_NAME = host_breakpad_common_s
 
 LOCAL_INCLUDES 	= -I$(srcdir)/..
 
-ifeq ($(OS_ARCH),Darwin)
+ifeq (,$(filter-out Darwin Linux,$(OS_ARCH)))
 DIRS = dwarf
 endif
 
 CPPSRCS	= \
   string_conversion.cc \
   $(NULL)
 
 CSRCS = \
--- a/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in
@@ -44,18 +44,24 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= breakpad_dwarf
 HOST_LIBRARY_NAME = host_breakpad_dwarf_s
 
 LOCAL_INCLUDES 	= -I$(srcdir)/../..
 
 HOST_CPPSRCS = \
   bytereader.cc \
+  dwarf2diehandler.cc \
   dwarf2reader.cc \
-  functioninfo.cc \
   $(NULL)
 
-HOST_CXXFLAGS += -funsigned-char
+ifeq (Darwin,$(HOST_OS_ARCH))
+HOST_CPPSRCS += functioninfo.cc
+endif
+
+# This code is only compiled for build-time tools,
+# so enabling RTTI should be fine.
+HOST_CXXFLAGS := -funsigned-char $(filter-out -fno-rtti,$(HOST_CXXFLAGS))
 
 # need static lib
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
@@ -49,19 +49,24 @@ LOCAL_INCLUDES 	= -I$(srcdir)/../..
 
 CPPSRCS	= \
   file_id.cc \
   guid_creator.cc \
   http_upload.cc \
   $(NULL)
 
 HOST_CPPSRCS = \
+  dump_stabs.cc \
   dump_symbols.cc \
+  dwarf_cfi_to_module.cc \
+  dwarf_cu_to_module.cc \
+  dwarf_line_to_module.cc \
   file_id.cc \
   guid_creator.cc \
+  language.cc \
   module.cc \
   stabs_reader.cc \
   $(NULL)
 
 # need static lib
 FORCE_STATIC_LIB = 1
 FORCE_USE_PIC = 1
 
--- a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
@@ -50,15 +50,16 @@ LOCAL_INCLUDES 	= \
 
 HOST_CPPSRCS = \
   dump_syms.cc \
   $(NULL)
 
 HOST_LIBS += \
   $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/linux/$(LIB_PREFIX)host_breakpad_linux_common_s.$(LIB_SUFFIX) \
   $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)host_breakpad_common_s.$(LIB_SUFFIX) \
+  $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/dwarf/$(LIB_PREFIX)host_breakpad_dwarf_s.$(LIB_SUFFIX) \
   $(NULL)
 
 # force C++ linking
 CPP_PROG_LINK = 1
 FORCE_USE_PIC = 1
 
 include $(topsrcdir)/config/rules.mk