diff options
| author | nealsid <nealsid@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2009-12-01 21:35:52 +0000 |
|---|---|---|
| committer | nealsid <nealsid@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2009-12-01 21:35:52 +0000 |
| commit | 096992fac73756cfa0974a94754329f30fd4e786 (patch) | |
| tree | c38f1e56f91e8f167b9e5012662f31fc2da434aa /src/tools | |
| parent | don't output duplicate filenames in PDBSourceLineWriter. r=mark at http://bre... (diff) | |
| download | breakpad-096992fac73756cfa0974a94754329f30fd4e786.tar.xz | |
Upstreaming several patches from Chrome:
Build fix for systems where sys/user.h needs sys/types.h....
http://breakpad.appspot.com/40002
MDRawSystemInfo.processor_level refers to the CPU family, not the cpuid level..
http://breakpad.appspot.com/40003
Use MD_MODULE_SIZE in place of sizeof(MDRawModule).
http://breakpad.appspot.com/39003
Linux x64 compile fix.
http://breakpad.appspot.com/40004
Include linux_syscall_support.h to get definition of NT_PRXFPREG. This is
Chromium commit 23659.
http://breakpad.appspot.com/40005
Build breakpad / crash reporting on Linux 64-bit. This is Chromium commit
23396.
http://breakpad.appspot.com/40006
Fix #includes in a couple unit tests.
http://breakpad.appspot.com/41001
Clean up unused headers / files for Linux dump_syms.
http://breakpad.appspot.com/40002
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@432 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/linux/dump_syms/Makefile | 9 | ||||
| -rw-r--r-- | src/tools/linux/md2core/minidump-2-core.cc | 5 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/tools/linux/dump_syms/Makefile b/src/tools/linux/dump_syms/Makefile index 59db7374..289dc4d8 100644 --- a/src/tools/linux/dump_syms/Makefile +++ b/src/tools/linux/dump_syms/Makefile @@ -16,8 +16,7 @@ BIN=dump_syms all:$(BIN) -DUMP_OBJ=dump_symbols.o guid_creator.o dump_syms.o file_id.o md5.o \ - stabs_reader.o module.o +DUMP_OBJ=dump_symbols.o dump_syms.o file_id.o stabs_reader.o module.o dump_syms:$(DUMP_OBJ) $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ @@ -31,14 +30,8 @@ stabs_reader.o:../../../common/linux/stabs_reader.cc module.o:../../../common/linux/module.cc $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $^ -guid_creator.o:../../../common/linux/guid_creator.cc - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $^ - file_id.o:../../../common/linux/file_id.cc $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $^ -md5.o:../../../common/md5.c - $(CC) $(CPPFLAGS) $(CXXFLAGS) -c $^ - clean: rm -f $(BIN) $(DUMP_OBJ) diff --git a/src/tools/linux/md2core/minidump-2-core.cc b/src/tools/linux/md2core/minidump-2-core.cc index e333d119..29ae3280 100644 --- a/src/tools/linux/md2core/minidump-2-core.cc +++ b/src/tools/linux/md2core/minidump-2-core.cc @@ -47,7 +47,8 @@ #include "google_breakpad/common/minidump_format.h" #include "google_breakpad/common/minidump_cpu_x86.h" -#include "breakpad/linux/minidump_format_linux.h" +#include "common/linux/linux_syscall_support.h" +#include "common/linux/minidump_format_linux.h" #if __WORDSIZE == 64 #define ELF_CLASS ELFCLASS64 @@ -419,7 +420,7 @@ ParseModuleStream(CrashedProcess* crashinfo, MMappedRange range) { CrashedProcess::Mapping mapping; const MDRawModule* rawmodule = (MDRawModule*) range.GetArrayElement(sizeof(uint32_t), - sizeof(MDRawModule), i); + MD_MODULE_SIZE, i); mapping.start_address = rawmodule->base_of_image; mapping.end_address = rawmodule->size_of_image + rawmodule->base_of_image; |