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

Fixup breakpad compile for Xcode 5.1 iOS release

Browse Source 
(https://breakpad.appspot.com/1154002/)



git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1282 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
dmaclach 2014-02-24 21:35:40 +00:00
parent 9315301a56
commit 47585f7dee
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/ios/Breakpad.xcodeproj/project.pbxproj
View File

@ -370,6 +370,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = { 0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0510;
}; };
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "Breakpad" */; buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "Breakpad" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
@ -439,7 +440,6 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DSTROOT = /tmp/Breakpad.dst; DSTROOT = /tmp/Breakpad.dst;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -471,7 +471,6 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
DSTROOT = /tmp/Breakpad.dst; DSTROOT = /tmp/Breakpad.dst;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
@ -499,7 +498,6 @@
1DEB922308733DC00010E9CD /* Debug */ = { 1DEB922308733DC00010E9CD /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
GCC_C_LANGUAGE_STANDARD = c99; GCC_C_LANGUAGE_STANDARD = c99;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
@ -517,6 +515,8 @@
../../client/apple/Framework, ../../client/apple/Framework,
../../common/mac, ../../common/mac,
); );
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos; SDKROOT = iphoneos;
}; };
@ -525,7 +525,6 @@
1DEB922408733DC00010E9CD /* Release */ = { 1DEB922408733DC00010E9CD /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
GCC_C_LANGUAGE_STANDARD = c99; GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@ -542,6 +541,7 @@
../../client/apple/Framework, ../../client/apple/Framework,
../../common/mac, ../../common/mac,
); );
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos; SDKROOT = iphoneos;
}; };

4
src/client/mac/Framework/Breakpad.mm
View File

@ -102,7 +102,7 @@ class ProtectedMemoryLocker {
: mutex_(mutex), : mutex_(mutex),
allocator_(allocator) { allocator_(allocator) {
// Lock the mutex // Lock the mutex
int rv = pthread_mutex_lock(mutex_); __attribute__((unused)) int rv = pthread_mutex_lock(mutex_);
assert(rv == 0); assert(rv == 0);
// Unprotect the memory // Unprotect the memory
@ -114,7 +114,7 @@ class ProtectedMemoryLocker {
allocator_->Protect(); allocator_->Protect();
// Then unlock the mutex // Then unlock the mutex
int rv = pthread_mutex_unlock(mutex_); __attribute__((unused)) int rv = pthread_mutex_unlock(mutex_);
assert(rv == 0); assert(rv == 0);
}; };

4
src/client/mac/handler/breakpad_nlist_64.cc
View File

@ -281,7 +281,7 @@ int __breakpad_fdnlist(int fd, nlist_type *list, const char **symbolNames,
off_t sa; /* symbol address */ off_t sa; /* symbol address */
off_t ss; /* start of strings */ off_t ss; /* start of strings */
register register_t n; register_t n;
if (*((unsigned int *)&buf) == magic) { if (*((unsigned int *)&buf) == magic) {
if (lseek(fd, arch_offset, SEEK_SET) == -1) { if (lseek(fd, arch_offset, SEEK_SET) == -1) {
return -1; return -1;
@ -354,7 +354,7 @@ int __breakpad_fdnlist(int fd, nlist_type *list, const char **symbolNames,
// and look for a match // and look for a match
while (n) { while (n) {
nlist_type space[BUFSIZ/sizeof (nlist_type)]; nlist_type space[BUFSIZ/sizeof (nlist_type)];
register register_t m = sizeof (space); register_t m = sizeof (space);
if (n < m) if (n < m)
m = n; m = n;

2
src/common/md5.cc
View File

@ -166,7 +166,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
*/ */
static void MD5Transform(u32 buf[4], u32 const in[16]) static void MD5Transform(u32 buf[4], u32 const in[16])
{ {
register u32 a, b, c, d; u32 a, b, c, d;
a = buf[0]; a = buf[0];
b = buf[1]; b = buf[1];