diff --git a/arch/z80/include/ez80/irq.h b/arch/z80/include/ez80/irq.h
index 339eca4e108..861cc98a91c 100644
--- a/arch/z80/include/ez80/irq.h
+++ b/arch/z80/include/ez80/irq.h
@@ -248,6 +248,7 @@ struct xcptcontext
 
   chipreg_t regs[XCPTCONTEXT_REGS];
 
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   /* The following retains that state during signal execution
    *
    * REVISIT:  Because there is only one copy of these save areas,
@@ -258,6 +259,7 @@ struct xcptcontext
 
   chipreg_t saved_pc;    /* Saved return address */
   chipreg_t saved_i;     /* Saved interrupt state */
+#endif /* CONFIG_ENABLE_ALL_SIGNALS */
 };
 #endif
 
diff --git a/arch/z80/include/z180/irq.h b/arch/z80/include/z180/irq.h
index 3afec621072..e121178ffe9 100644
--- a/arch/z80/include/z180/irq.h
+++ b/arch/z80/include/z180/irq.h
@@ -175,6 +175,7 @@ struct xcptcontext
 
   chipreg_t regs[XCPTCONTEXT_REGS];
 
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   /* The following retains that state during signal execution
    *
    * REVISIT:  Because there is only one copy of these save areas,
@@ -185,6 +186,7 @@ struct xcptcontext
 
   uint16_t saved_pc;    /* Saved return address */
   uint16_t saved_i;     /* Saved interrupt state */
+#endif /* CONFIG_ENABLE_ALL_SIGNALS */
 };
 #endif
 
diff --git a/arch/z80/include/z8/irq.h b/arch/z80/include/z8/irq.h
index 37148633b8f..454518d18bf 100644
--- a/arch/z80/include/z8/irq.h
+++ b/arch/z80/include/z8/irq.h
@@ -306,6 +306,7 @@ struct xcptcontext
 
   chipreg_t regs[XCPTCONTEXT_REGS];
 
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   /* The following retains that state during signal execution
    *
    * REVISIT:  Because there is only one copy of these save areas,
@@ -316,6 +317,7 @@ struct xcptcontext
 
   uint16_t saved_pc;        /* Saved return address */
   uint16_t saved_irqctl;    /* Saved interrupt state */
+#endif /* CONFIG_ENABLE_ALL_SIGNALS */
 };
 #endif
 
diff --git a/arch/z80/include/z80/irq.h b/arch/z80/include/z80/irq.h
index 956b2d6461e..fcdc58a81ee 100644
--- a/arch/z80/include/z80/irq.h
+++ b/arch/z80/include/z80/irq.h
@@ -90,6 +90,7 @@ struct xcptcontext
 
   chipreg_t regs[XCPTCONTEXT_REGS];
 
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   /* The following retains that state during signal execution.
    *
    * REVISIT:  Because there is only one copy of these save areas,
@@ -100,6 +101,7 @@ struct xcptcontext
 
   uint16_t saved_pc;    /* Saved return address */
   uint16_t saved_i;     /* Saved interrupt state */
+#endif /* CONFIG_ENABLE_ALL_SIGNALS */
 };
 #endif
 
diff --git a/arch/z80/src/ez80/Make.defs b/arch/z80/src/ez80/Make.defs
index 61aa51c3c3c..30adfacf377 100644
--- a/arch/z80/src/ez80/Make.defs
+++ b/arch/z80/src/ez80/Make.defs
@@ -55,9 +55,12 @@ CHIP_ASRCS += ez80_getsp.asm
 endif
 
 CHIP_CSRCS  = ez80_clock.c ez80_initialstate.c ez80_irq.c ez80_copystate.c
-CHIP_CSRCS += ez80_schedulesigaction.c ez80_sigdeliver.c
 CHIP_CSRCS += ez80_timerisr.c ez80_serial.c
 
+ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
+CHIP_CSRCS += ez80_schedulesigaction.c ez80_sigdeliver.c
+endif
+
 ifeq ($(CONFIG_ARCH_STACKDUMP),y)
 CHIP_CSRCS += ez80_registerdump.c
 endif
diff --git a/arch/z80/src/z180/Make.defs b/arch/z80/src/z180/Make.defs
index 61aab00c95d..89e773ea03f 100644
--- a/arch/z80/src/z180/Make.defs
+++ b/arch/z80/src/z180/Make.defs
@@ -45,7 +45,11 @@ endif
 
 CHIP_CSRCS  = z180_copystate.c z180_initialstate.c z180_io.c z180_irq.c
 CHIP_CSRCS += z180_lowscc.c z180_lowserial.c z180_modifiyreg8.c z180_mmu.c
-CHIP_CSRCS += z180_registerdump.c z180_schedulesigaction.c z180_sigdeliver.c
+CHIP_CSRCS += z180_registerdump.c
+
+ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
+CHIP_CSRCS += z180_schedulesigaction.c z180_sigdeliver.c
+endif
 
 ifneq ($(CONFIG_SCHED_TICKLESS),y)
 CHIP_CSRCS += z180_timerisr.c
diff --git a/arch/z80/src/z8/Make.defs b/arch/z80/src/z8/Make.defs
index 299b0b9a3e7..4202496dd24 100644
--- a/arch/z80/src/z8/Make.defs
+++ b/arch/z80/src/z8/Make.defs
@@ -30,9 +30,12 @@ CMN_CSRCS += z80_stackframe.c z80_usestack.c
 
 CHIP_SSRCS  = z8_vector.S z8_saveusercontext.S z8_restorecontext.S
 CHIP_CSRCS  = z8_initialstate.c z8_irq.c z8_saveirqcontext.c
-CHIP_CSRCS += z8_schedulesigaction.c z8_sigdeliver.c
 CHIP_CSRCS += z8_serial.c z8_i2c.c z8_registerdump.c
 
+ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
+CMN_CSRCS += z8_schedulesigaction.c z8_sigdeliver.c
+endif
+
 ifneq ($(CONFIG_SCHED_TICKLESS),y)
 CHIP_CSRCS += z8_timerisr.c
 endif
diff --git a/arch/z80/src/z80/Make.defs b/arch/z80/src/z80/Make.defs
index 0152299e47a..fd31b350f65 100644
--- a/arch/z80/src/z80/Make.defs
+++ b/arch/z80/src/z80/Make.defs
@@ -37,5 +37,8 @@ CMN_CSRCS += z80_usestack.c
 CHIP_ASRCS  = z80_saveusercontext.asm z80_restoreusercontext.asm
 
 CHIP_CSRCS  = z80_initialstate.c z80_io.c z80_irq.c z80_copystate.c
-CHIP_CSRCS += z80_schedulesigaction.c z80_sigdeliver.c
 CHIP_CSRCS += z80_registerdump.c
+
+ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
+CHIP_CSRCS += z80_schedulesigaction.c z80_sigdeliver.c
+endif