--- a/packages/hal/common/current/cdl/debugging.cdl
+++ b/packages/hal/common/current/cdl/debugging.cdl
@@ -83,9 +83,15 @@ cdl_option CYGDBG_HAL_DEBUG_GDB_BREAK_SU
         GDB stubs are present."
 }
 
+cdl_interface CYGINT_HAL_DEBUG_GDB_CTRLC_UNSUPPORTED {
+    display "Platform does not support CTRLC"
+    no_define
+}
+
 cdl_option CYGDBG_HAL_DEBUG_GDB_CTRLC_SUPPORT {
     display       "Include GDB external break support when no stubs"
     requires      !CYGDBG_HAL_DEBUG_GDB_BREAK_SUPPORT
+    active_if     { CYGINT_HAL_DEBUG_GDB_CTRLC_UNSUPPORTED == 0 }
     default_value 1
     description   "
         This option adds an interrupt handler for the GDB serial line
@@ -98,9 +104,11 @@ cdl_option CYGDBG_HAL_DEBUG_GDB_CTRLC_SU
 
 cdl_option CYGDBG_HAL_DEBUG_GDB_THREAD_SUPPORT {
     display       "Include GDB multi-threading debug support"
-    requires      CYGDBG_KERNEL_DEBUG_GDB_THREAD_SUPPORT
-    default_value CYGDBG_KERNEL_DEBUG_GDB_THREAD_SUPPORT
+    active_if     { CYGSEM_HAL_ROM_MONITOR || CYGDBG_KERNEL_DEBUG_GDB_THREAD_SUPPORT }
+    default_value 1
     description   "
         This option enables some extra HAL code which is needed
         to support multi-threaded source level debugging."
+
+    compile dbg-threads-syscall.c
 }