From 2018ceca3b715e125a5af965dac5292b4bc2ec65 Mon Sep 17 00:00:00 2001
From: Tom Poole <tom@juce.com>
Date: Wed, 10 Feb 2021 12:22:04 +0000
Subject: [PATCH] macOS ARM:  Allow the debugger to move past failed assertions

---
 modules/juce_core/juce_core.cpp                | 1 -
 modules/juce_core/system/juce_PlatformDefs.h   | 4 +---
 modules/juce_core/system/juce_StandardHeader.h | 4 +---
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/juce_core/juce_core.cpp b/modules/juce_core/juce_core.cpp
index fd1a760425..84ded5f5f6 100644
--- a/modules/juce_core/juce_core.cpp
+++ b/modules/juce_core/juce_core.cpp
@@ -110,7 +110,6 @@
 #if JUCE_MAC || JUCE_IOS
  #include <xlocale.h>
  #include <mach/mach.h>
- #include <signal.h>
 #endif
 
 #if JUCE_ANDROID
diff --git a/modules/juce_core/system/juce_PlatformDefs.h b/modules/juce_core/system/juce_PlatformDefs.h
index 0016abfb0b..43000cab6b 100644
--- a/modules/juce_core/system/juce_PlatformDefs.h
+++ b/modules/juce_core/system/juce_PlatformDefs.h
@@ -59,15 +59,13 @@ namespace juce
 #endif
 
 //==============================================================================
-#if JUCE_IOS || JUCE_LINUX
+#if JUCE_IOS || (JUCE_MAC && JUCE_ARM) || JUCE_LINUX
   /** This will try to break into the debugger if the app is currently being debugged.
       If called by an app that's not being debugged, the behaviour isn't defined - it may
       crash or not, depending on the platform.
       @see jassert()
   */
   #define JUCE_BREAK_IN_DEBUGGER        { ::kill (0, SIGTRAP); }
-#elif JUCE_MAC && JUCE_CLANG && JUCE_ARM
-  #define JUCE_BREAK_IN_DEBUGGER        { __builtin_debugtrap(); }
 #elif JUCE_MSVC
   #ifndef __INTEL_COMPILER
     #pragma intrinsic (__debugbreak)
diff --git a/modules/juce_core/system/juce_StandardHeader.h b/modules/juce_core/system/juce_StandardHeader.h
index 29142b3990..f83869edcb 100644
--- a/modules/juce_core/system/juce_StandardHeader.h
+++ b/modules/juce_core/system/juce_StandardHeader.h
@@ -80,9 +80,7 @@ JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4514 4245 4100)
 #if JUCE_MAC || JUCE_IOS
  #include <libkern/OSAtomic.h>
  #include <xlocale.h>
- #if JUCE_IOS
-  #include <signal.h>
- #endif
+ #include <signal.h>
 #endif
 
 #if JUCE_LINUX