From 58b04cdfa42d09a5618c14317a03c8979b65d774 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Wed, 29 Jun 2022 19:08:41 -0400
Subject: [PATCH 1/3] Switch to an alternative form of avoiding unused goto
 warnings.

---
 Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp b/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
index 83c1db06a..5d09bdfef 100644
--- a/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
+++ b/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
@@ -224,7 +224,9 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 #define MoveToStateDynamic(x)	{ state_ = x; continue; }
 
 	// Sets the start position for state x.
-#define BeginState(x)			case ExecutionState::x: [[maybe_unused]] x
+	// The `if constexpr` is a slightly-silly way of eliminating a Clang warning about
+	// unused goto targets.
+#define BeginState(x)			case ExecutionState::x: if constexpr (false) goto x; x
 
 	// Sets the start position for the addressing mode y within state x,
 	// where x was declared as an AddressingDispatch.

From c133f80c7316710f2118cba4ef416b827acf7439 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Wed, 29 Jun 2022 19:20:44 -0400
Subject: [PATCH 2/3] Try a compiler-specific attribute.

---
 .../68000Mk2/Implementation/68000Mk2Implementation.hpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp b/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
index 5d09bdfef..f2f7c02f0 100644
--- a/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
+++ b/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
@@ -223,10 +223,14 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 	// Moves to state x by dynamic dispatch; x can be a regular variable.
 #define MoveToStateDynamic(x)	{ state_ = x; continue; }
 
+#ifdef __GNUC__
+#define MAYBE_UNUSED __attribute__ ((unused))
+#else
+#define MAYBE_UNUSED /* */
+#endif
+
 	// Sets the start position for state x.
-	// The `if constexpr` is a slightly-silly way of eliminating a Clang warning about
-	// unused goto targets.
-#define BeginState(x)			case ExecutionState::x: if constexpr (false) goto x; x
+#define BeginState(x)			case ExecutionState::x: MAYBE_UNUSED x
 
 	// Sets the start position for the addressing mode y within state x,
 	// where x was declared as an AddressingDispatch.

From b1d8a453395b8a31a37b371e4d807f7b755d8fd3 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Wed, 29 Jun 2022 21:13:00 -0400
Subject: [PATCH 3/3] Just disable the diagnostic.

---
 .../Implementation/68000Mk2Implementation.hpp   | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp b/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
index f2f7c02f0..41ab1b05d 100644
--- a/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
+++ b/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
@@ -200,6 +200,11 @@ template <typename InstructionT> Microcycle::OperationT data_select(const Instru
 
 // MARK: - The state machine.
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-label"
+#endif
+
 template <class BusHandler, bool dtack_is_implicit, bool permit_overrun, bool signal_will_perform>
 void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perform>::run_for(HalfCycles duration) {
 	// Accumulate the newly paid-in cycles. If this instance remains in deficit, exit.
@@ -223,14 +228,8 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 	// Moves to state x by dynamic dispatch; x can be a regular variable.
 #define MoveToStateDynamic(x)	{ state_ = x; continue; }
 
-#ifdef __GNUC__
-#define MAYBE_UNUSED __attribute__ ((unused))
-#else
-#define MAYBE_UNUSED /* */
-#endif
-
 	// Sets the start position for state x.
-#define BeginState(x)			case ExecutionState::x: MAYBE_UNUSED x
+#define BeginState(x)			case ExecutionState::x: x
 
 	// Sets the start position for the addressing mode y within state x,
 	// where x was declared as an AddressingDispatch.
@@ -3079,6 +3078,10 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 	time_remaining_ = HalfCycles(0);
 }
 
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
 }
 }