Backed out changeset df90f0171ba7 (bug 543111)
authorBoris Zbarsky <bzbarsky@mit.edu>
Tue, 09 Feb 2010 14:33:19 -0500
changeset 38015 edbd3823dceb5ddb8cb16722fb98f34d571787e5
parent 38014 7bd24f6b3faf160b45e276f62ee4e49e8da63b89
child 38016 6925b24a91569914cb0534414f55608191d9c151
push idunknown
push userunknown
push dateunknown
bugs543111
milestone1.9.3a2pre
backs outdf90f0171ba7d51f932769131d4d0992b6debaa9
Backed out changeset df90f0171ba7 (bug 543111)
toolkit/crashreporter/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/dwarf/functioninfo.cc
toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
--- a/toolkit/crashreporter/Makefile.in
+++ b/toolkit/crashreporter/Makefile.in
@@ -56,29 +56,22 @@ DIRS += \
   google-breakpad/src/client/windows/sender \
   google-breakpad/src/client/windows/crash_generation \
   $(NULL)
 endif
 
 ifeq ($(OS_ARCH),Darwin)
 CMMSRCS = mac_utils.mm
 
-# Check both OS_ARCH (needed to be able to run it afterward) and
-# HOST_OS_ARCH (needed because it refuses to cross-compile).
-ifeq ($(HOST_OS_ARCH),Darwin)
-DIRS += \
-  google-breakpad/src/tools/mac/dump_syms \
-  $(NULL)
-endif
-
 DIRS += \
   google-breakpad/src/common \
   google-breakpad/src/common/mac \
   google-breakpad/src/client \
   google-breakpad/src/client/mac/handler \
+  google-breakpad/src/tools/mac/dump_syms \
   $(NULL)
 endif
 
 ifeq ($(OS_ARCH),Linux)
 # there's no define for this normally
 DEFINES += -DXP_LINUX
 DIRS += \
   google-breakpad/src/common \
--- a/toolkit/crashreporter/google-breakpad/src/common/dwarf/functioninfo.cc
+++ b/toolkit/crashreporter/google-breakpad/src/common/dwarf/functioninfo.cc
@@ -29,19 +29,16 @@
 // This is a client for the dwarf2reader to extract function and line
 // information from the debug info.
 
 #include <assert.h>
 
 #include <map>
 #include <queue>
 #include <vector>
-#include <limits.h>
-#include <stdio.h>
-#include <memory>
 
 #include "common/dwarf/functioninfo.h"
 
 #include "common/dwarf/bytereader.h"
 
 
 namespace dwarf2reader {
 
--- a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
@@ -57,20 +57,18 @@ CPPSRCS	= \
   string_utilities.cc \
   macho_utilities.cc \
   $(NULL)
 
 CMSRCS = \
   HTTPMultipartUpload.m \
   $(NULL)
 
-ifeq ($(HOST_OS_ARCH),Darwin)
 HOST_CPPSRCS = $(CPPSRCS)
 
 HOST_CMMSRCS = \
   dump_syms.mm \
   $(NULL)
-endif
 
 # need static lib
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk