Skip to content

Commit 5241443

Browse files
authored
Merge pull request #65 from microsoft/fix/xcode10
Ignore const casting issues in XCode 10 arm64e system defines
2 parents 6b38bde + 915aee6 commit 5241443

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# PLCrashReporter Change Log
22

3+
## Version 1.5.1
4+
5+
* Fix support for Xcode 10.
6+
7+
___
8+
39
## Version 1.5.0
410

511
* Drop support old versions of Xcode and iOS. The minimal versions are Xcode 10 and iOS 8 now.

CrashReporter.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5686,7 +5686,7 @@
56865686
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
56875687
CLANG_CXX_LIBRARY = "libc++";
56885688
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
5689-
CURRENT_PROJECT_VERSION = 1.5.0;
5689+
CURRENT_PROJECT_VERSION = 1.5.1;
56905690
GCC_C_LANGUAGE_STANDARD = c99;
56915691
GCC_ENABLE_CPP_EXCEPTIONS = NO;
56925692
GCC_OPTIMIZATION_LEVEL = 0;
@@ -5738,7 +5738,7 @@
57385738
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
57395739
CLANG_CXX_LIBRARY = "libc++";
57405740
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
5741-
CURRENT_PROJECT_VERSION = 1.5.0;
5741+
CURRENT_PROJECT_VERSION = 1.5.1;
57425742
GCC_C_LANGUAGE_STANDARD = c99;
57435743
GCC_ENABLE_CPP_EXCEPTIONS = NO;
57445744
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;

PLCrashReporter.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |spec|
22
spec.name = 'PLCrashReporter'
3-
spec.version = '1.5.0'
3+
spec.version = '1.5.1'
44
spec.summary = 'Reliable, open-source crash reporting for iOS, macOS and tvOS.'
55
spec.description = 'PLCrashReporter is a reliable open source library that provides an in-process live crash reporting framework for use on iOS, macOS and tvOS. The library detects crashes and generates reports to help your investigation and troubleshooting with the information of application, system, process, thread, etc. as well as stack traces.'
66

Source/PLCrashAsyncThread_arm.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,10 +291,14 @@ static inline plcrash_greg_t plcrash_async_thread_state_get_reg_64 (const plcras
291291
case PLCRASH_ARM64_X26: return THREAD_STATE_GET(x[26], thread.ts_64, ts);
292292
case PLCRASH_ARM64_X27: return THREAD_STATE_GET(x[27], thread.ts_64, ts);
293293
case PLCRASH_ARM64_X28: return THREAD_STATE_GET(x[28], thread.ts_64, ts);
294+
#pragma clang diagnostic push
295+
// XCode 10 wants non-const pointer for arm_thread_state64_get_* (fixed in XCode 11).
296+
#pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qualifiers"
294297
case PLCRASH_ARM64_FP: return THREAD_STATE_GET_PTR(fp, thread.ts_64, ts);
295298
case PLCRASH_ARM64_SP: return THREAD_STATE_GET_PTR(sp, thread.ts_64, ts);
296299
case PLCRASH_ARM64_LR: return THREAD_STATE_GET_FPTR(lr, thread.ts_64, ts);
297300
case PLCRASH_ARM64_PC: return THREAD_STATE_GET_FPTR(pc, thread.ts_64, ts);
301+
#pragma clang diagnostic pop
298302
case PLCRASH_ARM64_CPSR: return THREAD_STATE_GET(cpsr, thread.ts_64, ts);
299303
default: __builtin_trap();
300304
}

0 commit comments

Comments
 (0)