diff --git a/arch/sparc/include/sparc_v8/irq.h b/arch/sparc/include/sparc_v8/irq.h
index 701df770f34..eb61189f889 100644
--- a/arch/sparc/include/sparc_v8/irq.h
+++ b/arch/sparc/include/sparc_v8/irq.h
@@ -429,6 +429,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.
    *
@@ -450,6 +451,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/sparc/src/sparc_v8/Make.defs b/arch/sparc/src/sparc_v8/Make.defs
index fb5adaa7456..f7315f34ce3 100644
--- a/arch/sparc/src/sparc_v8/Make.defs
+++ b/arch/sparc/src/sparc_v8/Make.defs
@@ -27,6 +27,10 @@ include common/Make.defs
 CMN_ASRCS += sparc_v8_syscall.S
 CMN_CSRCS += sparc_v8_copystate.c sparc_v8_doirq.c
 CMN_CSRCS += sparc_v8_initialstate.c sparc_v8_irq.c
-CMN_CSRCS += sparc_v8_schedulesigaction.c sparc_v8_saveusercontext.c
-CMN_CSRCS += sparc_v8_sigdeliver.c sparc_v8_swint1.c sparc_v8_systemreset.c
+CMN_CSRCS += sparc_v8_saveusercontext.c
+CMN_CSRCS += sparc_v8_swint1.c sparc_v8_systemreset.c
 CMN_CSRCS += sparc_v8_switchcontext.c sparc_v8_registerdump.c
+
+ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
+  CMN_CSRCS += sparc_v8_schedulesigaction.c sparc_v8_sigdeliver.c
+endif