summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-11-16 08:57:53 +0100
committerGitHub <noreply@github.com>2021-11-16 08:57:53 +0100
commit7791599d5bcfdbae0d2a96e5fc13d9021ec820be (patch)
tree4e27dcacc832b1ce1a7536235a6f3e9621010a90
parent974afa726223bd28ac2bf87a2ec32142878cd2f5 (diff)
parentc8037ef2e5b065c1fe5e0241e4cde0376a367ed0 (diff)
Merge pull request #55019 from bruvzg/macos_crash_handler
[macOS] Fix crash handler not printing function names on M1 Macs.
-rw-r--r--platform/osx/crash_handler_osx.mm5
1 files changed, 5 insertions, 0 deletions
diff --git a/platform/osx/crash_handler_osx.mm b/platform/osx/crash_handler_osx.mm
index 2252d5eb4f..57bca7a5b9 100644
--- a/platform/osx/crash_handler_osx.mm
+++ b/platform/osx/crash_handler_osx.mm
@@ -134,8 +134,13 @@ static void handle_crash(int sig) {
args.push_back("-o");
args.push_back(_execpath);
+#if defined(__x86_64) || defined(__x86_64__) || defined(__amd64__)
args.push_back("-arch");
args.push_back("x86_64");
+#elif defined(__aarch64__)
+ args.push_back("-arch");
+ args.push_back("arm64");
+#endif
args.push_back("-l");
snprintf(str, 1024, "%p", load_addr);
args.push_back(str);