diff --git a/arch/avr/include/avr/irq.h b/arch/avr/include/avr/irq.h
index 53c5ab6e7ad..e9a603b55c1 100644
--- a/arch/avr/include/avr/irq.h
+++ b/arch/avr/include/avr/irq.h
@@ -103,6 +103,7 @@
 #ifndef __ASSEMBLY__
 struct xcptcontext
 {
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   /* These are saved copies of PC and SR used during signal processing.
    *
    * REVISIT:  Because there is only one copy of these save areas,
@@ -120,6 +121,7 @@ struct xcptcontext
   uint8_t saved_rampz;
 #endif
   uint8_t saved_sreg;
+#endif /* CONFIG_ENABLE_ALL_SIGNALS */
 
   /* Register save area */
 
diff --git a/arch/avr/include/avr32/irq.h b/arch/avr/include/avr32/irq.h
index a60fa9cda33..768b9fc3e1c 100644
--- a/arch/avr/include/avr32/irq.h
+++ b/arch/avr/include/avr32/irq.h
@@ -95,6 +95,7 @@
 #ifndef __ASSEMBLY__
 struct xcptcontext
 {
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   /* These are saved copies of PC and SR used during signal processing.
    *
    * REVISIT:  Because there is only one copy of these save areas,
@@ -105,6 +106,7 @@ struct xcptcontext
 
   uint32_t saved_pc;
   uint32_t saved_sr;
+#endif /* CONFIG_ENABLE_ALL_SIGNALS */
 
   /* Register save area */
 
diff --git a/arch/avr/src/at32uc3/Make.defs b/arch/avr/src/at32uc3/Make.defs
index ea6485cde7d..0f7e08317cb 100644
--- a/arch/avr/src/at32uc3/Make.defs
+++ b/arch/avr/src/at32uc3/Make.defs
@@ -30,9 +30,13 @@ CMN_ASRCS  = avr_exceptions.S avr_fullcontextrestore.S avr_doswitch.S avr_saveus
 CMN_CSRCS  = avr_allocateheap.c avr_copystate.c avr_createstack.c avr_exit.c
 CMN_CSRCS += avr_initialize.c avr_initialstate.c avr_idle.c
 CMN_CSRCS += avr_modifyreg8.c avr_modifyreg16.c avr_modifyreg32.c avr_releasestack.c
-CMN_CSRCS += avr_schedulesigaction.c avr_sigdeliver.c avr_stackframe.c avr_switchcontext.c
+CMN_CSRCS += avr_stackframe.c avr_switchcontext.c
 CMN_CSRCS += avr_usestack.c avr_doirq.c avr_nputs.c avr_registerdump.c avr_getintstack.c
 
+ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
+CMN_CSRCS += avr_schedulesigaction.c avr_sigdeliver.c
+endif
+
 # Required AT32UC3 files
 
 CHIP_CSRCS  = at32uc3_clkinit.c at32uc3_gpio.c at32uc3_irq.c
diff --git a/arch/avr/src/at90usb/Make.defs b/arch/avr/src/at90usb/Make.defs
index 71138b4f9a9..3a935f71ca7 100644
--- a/arch/avr/src/at90usb/Make.defs
+++ b/arch/avr/src/at90usb/Make.defs
@@ -32,11 +32,15 @@ CMN_CSRCS += avr_doirq.c avr_exit.c avr_idle.c avr_irq.c
 CMN_CSRCS += avr_initialize.c avr_initialstate.c avr_lowputs.c
 CMN_CSRCS += avr_modifyreg8.c avr_modifyreg16.c avr_modifyreg32.c
 CMN_CSRCS += avr_nputs.c avr_releasestack.c avr_registerdump.c
-CMN_CSRCS += avr_schedulesigaction.c avr_sigdeliver.c avr_getintstack.c
+CMN_CSRCS += avr_getintstack.c
 CMN_CSRCS += avr_stackframe.c avr_switchcontext.c avr_usestack.c
 
 # Configuration-dependent common files
 
+ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
+CMN_CSRCS += avr_schedulesigaction.c avr_sigdeliver.c
+endif
+
 ifeq ($(CONFIG_AVR_SPI),y)
 CMN_CSRCS += avr_spi.c
 endif
diff --git a/arch/avr/src/atmega/Make.defs b/arch/avr/src/atmega/Make.defs
index d53a0fcddab..a978a852cb4 100644
--- a/arch/avr/src/atmega/Make.defs
+++ b/arch/avr/src/atmega/Make.defs
@@ -32,11 +32,15 @@ CMN_CSRCS += avr_doirq.c avr_exit.c avr_idle.c avr_initialize.c
 CMN_CSRCS += avr_initialstate.c avr_irq.c avr_lowputs.c
 CMN_CSRCS += avr_modifyreg8.c avr_modifyreg16.c avr_modifyreg32.c
 CMN_CSRCS += avr_nputs.c avr_releasestack.c avr_registerdump.c
-CMN_CSRCS += avr_schedulesigaction.c avr_sigdeliver.c avr_getintstack.c
 CMN_CSRCS += avr_stackframe.c avr_switchcontext.c avr_usestack.c
+CMN_CSRCS += avr_getintstack.c
 
 # Configuration-dependent common files
 
+ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
+CMN_CSRCS += avr_schedulesigaction.c avr_sigdeliver.c
+endif
+
 ifeq ($(CONFIG_AVR_SPI),y)
 CMN_CSRCS += avr_spi.c
 endif