Merge pull request #65 from microsoft/fix/xcode10

Ignore const casting issues in XCode 10 arm64e system defines
microsoft · Mar 18, 2020 · 5241443 · 5241443
2 parents 6b38bde + 915aee6
commit 5241443
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # PLCrashReporter Change Log
 
+## Version 1.5.1
+
+* Fix support for Xcode 10.
+
+___
+
 ## Version 1.5.0
 
 * Drop support old versions of Xcode and iOS. The minimal versions are Xcode 10 and iOS 8 now.

diff --git a/CrashReporter.xcodeproj/project.pbxproj b/CrashReporter.xcodeproj/project.pbxproj
@@ -5686,7 +5686,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CURRENT_PROJECT_VERSION = 1.5.0;
+				CURRENT_PROJECT_VERSION = 1.5.1;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_ENABLE_CPP_EXCEPTIONS = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -5738,7 +5738,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CURRENT_PROJECT_VERSION = 1.5.0;
+				CURRENT_PROJECT_VERSION = 1.5.1;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_ENABLE_CPP_EXCEPTIONS = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;

diff --git a/PLCrashReporter.podspec b/PLCrashReporter.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name        = 'PLCrashReporter'
-  spec.version     = '1.5.0'
+  spec.version     = '1.5.1'
   spec.summary     = 'Reliable, open-source crash reporting for iOS, macOS and tvOS.'
   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.'
 

diff --git a/Source/PLCrashAsyncThread_arm.c b/Source/PLCrashAsyncThread_arm.c
@@ -291,10 +291,14 @@ static inline plcrash_greg_t plcrash_async_thread_state_get_reg_64 (const plcras
         case PLCRASH_ARM64_X26: return THREAD_STATE_GET(x[26], thread.ts_64, ts);
         case PLCRASH_ARM64_X27: return THREAD_STATE_GET(x[27], thread.ts_64, ts);
         case PLCRASH_ARM64_X28: return THREAD_STATE_GET(x[28], thread.ts_64, ts);
+#pragma clang diagnostic push
+// XCode 10 wants non-const pointer for arm_thread_state64_get_* (fixed in XCode 11).
+#pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qualifiers"
         case PLCRASH_ARM64_FP: return THREAD_STATE_GET_PTR(fp, thread.ts_64, ts);
         case PLCRASH_ARM64_SP: return THREAD_STATE_GET_PTR(sp, thread.ts_64, ts);
         case PLCRASH_ARM64_LR: return THREAD_STATE_GET_FPTR(lr, thread.ts_64, ts);
         case PLCRASH_ARM64_PC: return THREAD_STATE_GET_FPTR(pc, thread.ts_64, ts);
+#pragma clang diagnostic pop
         case PLCRASH_ARM64_CPSR: return THREAD_STATE_GET(cpsr, thread.ts_64, ts);
         default: __builtin_trap();
     }