generic-library/breakpad
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-enable ios_exception_minidump_generator being built on non-ARM.

Browse Source 
This file gets built on x86 as part of building Chromium for the iOS simulator,
which I had forgotten in the course of https://breakpad.appspot.com/664002/.

R=mark@chromium.org

Review URL: https://breakpad.appspot.com/774002

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1238 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
blundell@chromium.org 2013-12-02 16:02:48 +00:00
parent f546e072ce
commit b303174e32
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/client/ios/handler/ios_exception_minidump_generator.mm
View File

@ -37,10 +37,6 @@
#include "client/minidump_file_writer-inl.h" #include "client/minidump_file_writer-inl.h"
#include "common/scoped_ptr.h" #include "common/scoped_ptr.h"
#if !defined(HAS_ARM_SUPPORT) && !defined(HAS_ARM64_SUPPORT)
#error "This file should only be compiled for ARM processors"
#endif
#if defined(HAS_ARM_SUPPORT) && defined(HAS_ARM64_SUPPORT) #if defined(HAS_ARM_SUPPORT) && defined(HAS_ARM64_SUPPORT)
#error "This file should be compiled for only one architecture at a time" #error "This file should be compiled for only one architecture at a time"
#endif #endif
@ -83,7 +79,7 @@ bool IosExceptionMinidumpGenerator::WriteCrashingContext(
#elif defined(HAS_ARM64_SUPPORT) #elif defined(HAS_ARM64_SUPPORT)
return WriteCrashingContextARM64(register_location); return WriteCrashingContextARM64(register_location);
#else #else
#error "This file should only be compiled on ARM processors" assert(false);
return false; return false;
#endif #endif
} }
@ -134,6 +130,7 @@ uintptr_t IosExceptionMinidumpGenerator::GetLRFromException() {
bool IosExceptionMinidumpGenerator::WriteExceptionStream( bool IosExceptionMinidumpGenerator::WriteExceptionStream(
MDRawDirectory *exception_stream) { MDRawDirectory *exception_stream) {
#if defined(HAS_ARM_SUPPORT) || defined(HAS_ARM64_SUPPORT)
TypedMDRVA<MDRawExceptionStream> exception(&writer_); TypedMDRVA<MDRawExceptionStream> exception(&writer_);
if (!exception.Allocate()) if (!exception.Allocate())
@ -154,10 +151,14 @@ bool IosExceptionMinidumpGenerator::WriteExceptionStream(
exception_ptr->exception_record.exception_address = GetPCFromException(); exception_ptr->exception_record.exception_address = GetPCFromException();
return true; return true;
#else
return MinidumpGenerator::WriteExceptionStream(exception_stream);
#endif
} }
bool IosExceptionMinidumpGenerator::WriteThreadStream(mach_port_t thread_id, bool IosExceptionMinidumpGenerator::WriteThreadStream(mach_port_t thread_id,
MDRawThread *thread) { MDRawThread *thread) {
#if defined(HAS_ARM_SUPPORT) || defined(HAS_ARM64_SUPPORT)
if (pthread_mach_thread_np(pthread_self()) != thread_id) if (pthread_mach_thread_np(pthread_self()) != thread_id)
return MinidumpGenerator::WriteThreadStream(thread_id, thread); return MinidumpGenerator::WriteThreadStream(thread_id, thread);
@ -196,6 +197,9 @@ bool IosExceptionMinidumpGenerator::WriteThreadStream(mach_port_t thread_id,
thread->thread_id = thread_id; thread->thread_id = thread_id;
return true; return true;
#else
return MinidumpGenerator::WriteThreadStream(thread_id, thread);
#endif
} }
} // namespace google_breakpad } // namespace google_breakpad