diff --git a/arch/misoc/include/lm32/irq.h b/arch/misoc/include/lm32/irq.h
index ee7c687438b..518ebd7d234 100644
--- a/arch/misoc/include/lm32/irq.h
+++ b/arch/misoc/include/lm32/irq.h
@@ -181,6 +181,7 @@
 
 struct xcptcontext
 {
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   /* These additional register save locations are used to implement the
    * signal delivery trampoline.
    *
@@ -200,6 +201,7 @@ struct xcptcontext
 
   uint32_t sigreturn;
 #endif
+#endif /* CONFIG_ENABLE_ALL_SIGNALS */
 
 #ifdef CONFIG_BUILD_KERNEL
   /* The following array holds information needed to return from each nested
diff --git a/arch/misoc/include/minerva/irq.h b/arch/misoc/include/minerva/irq.h
index 414a781c0a1..465767e552d 100644
--- a/arch/misoc/include/minerva/irq.h
+++ b/arch/misoc/include/minerva/irq.h
@@ -263,6 +263,7 @@ struct xcpt_syscall_s
 
 struct xcptcontext
 {
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   /* These additional register save locations are used to implement the
    * signal delivery trampoline.
    */
@@ -277,6 +278,7 @@ struct xcptcontext
 
   uint32_t sigreturn;
 #endif
+#endif /* CONFIG_ENABLE_ALL_SIGNALS */
 
 #ifdef CONFIG_BUILD_KERNEL
   /* The following array holds information needed to return from each nested
diff --git a/arch/misoc/src/lm32/Make.defs b/arch/misoc/src/lm32/Make.defs
index b2847f7d25f..ac383557d85 100644
--- a/arch/misoc/src/lm32/Make.defs
+++ b/arch/misoc/src/lm32/Make.defs
@@ -33,5 +33,8 @@ CHIP_CSRCS  = lm32_allocateheap.c lm32_copystate.c lm32_createstack.c
 CHIP_CSRCS += lm32_decodeirq.c lm32_doirq.c lm32_exit.c lm32_flushcache.c
 CHIP_CSRCS += lm32_idle.c lm32_initialstate.c lm32_irq.c lm32_usetack.c
 CHIP_CSRCS += lm32_registerdump.c lm32_releasestack.c lm32_swint.c
-CHIP_CSRCS += lm32_stackframe.c lm32_switchcontext.c lm32_sigdeliver.c
-CHIP_CSRCS += lm32_schedulesigaction.c lm32_saveusercontext.c
+CHIP_CSRCS += lm32_stackframe.c lm32_switchcontext.c lm32_saveusercontext.c
+
+ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
+CHIP_CSRCS += lm32_schedulesigaction.c lm32_sigdeliver.c
+endif
diff --git a/arch/misoc/src/minerva/Make.defs b/arch/misoc/src/minerva/Make.defs
index e7285c01fd7..2b45142e3f0 100644
--- a/arch/misoc/src/minerva/Make.defs
+++ b/arch/misoc/src/minerva/Make.defs
@@ -34,5 +34,8 @@ CHIP_CSRCS += minerva_decodeirq.c minerva_doirq.c minerva_doexceptions.c
 CHIP_CSRCS += minerva_exit.c minerva_flushcache.c minerva_idle.c minerva_irq.c
 CHIP_CSRCS += minerva_initialstate.c minerva_registerdump.c minerva_releasestack.c
 CHIP_CSRCS += minerva_stackframe.c minerva_swint.c minerva_saveusercontext.c
-CHIP_CSRCS += minerva_switchcontext.c minerva_schedulesigaction.c minerva_sigdeliver.c
-CHIP_CSRCS += minerva_usetack.c
+CHIP_CSRCS += minerva_switchcontext.c minerva_usetack.c
+
+ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
+CHIP_CSRCS += minerva_schedulesigaction.c minerva_sigdeliver.c
+endif