diff --git a/arch/or1k/include/mor1kx/irq.h b/arch/or1k/include/mor1kx/irq.h
index b49a390e6cf..28bd362a5fb 100644
--- a/arch/or1k/include/mor1kx/irq.h
+++ b/arch/or1k/include/mor1kx/irq.h
@@ -171,6 +171,7 @@ struct xcptcontext
 
   uint32_t regs[XCPTCONTEXT_REGS];
 
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   /* These are saved copies of LR and CPSR used during
    * signal processing.
    *
@@ -182,6 +183,7 @@ struct xcptcontext
 
   uint32_t saved_pc;
   uint32_t saved_flags;
+#endif /* CONFIG_ENABLE_ALL_SIGNALS */
 };
 #endif
 
diff --git a/arch/or1k/src/mor1kx/Make.defs b/arch/or1k/src/mor1kx/Make.defs
index 8278d37f66f..a4bf24f9b53 100644
--- a/arch/or1k/src/mor1kx/Make.defs
+++ b/arch/or1k/src/mor1kx/Make.defs
@@ -32,7 +32,6 @@ CMN_CSRCS  = or1k_initialize.c \
              or1k_stackframe.c \
              or1k_initialstate.c \
              or1k_switchcontext.c \
-             or1k_schedulesigaction.c \
              or1k_copyfullstate.c \
              or1k_registerdump.c \
              or1k_getintstack.c \
@@ -45,6 +44,10 @@ CMN_CSRCS  = or1k_initialize.c \
              or1k_cpuinfo.c \
              mor1kx_start.c
 
+ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
+CMN_CSRCS += or1k_schedulesigaction.c
+endif
+
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CMN_CSRCS += or1k_task_start.c or1k_pthread_start.c
 #CMN_CSRCS += or1k_signal_dispatch.c