Skip to content

Commit 7ec86dc

Browse files
committed
arch/or1k: support decouple signal related function from arch code
support arch or1k implementation can work when signal is disabled Signed-off-by: guoshichao <[email protected]>
1 parent 273bc76 commit 7ec86dc

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

arch/or1k/include/mor1kx/irq.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ struct xcptcontext
171171

172172
uint32_t regs[XCPTCONTEXT_REGS];
173173

174+
#ifndef CONFIG_DISABLE_SIGNALS
174175
/* These are saved copies of LR and CPSR used during
175176
* signal processing.
176177
*
@@ -182,6 +183,7 @@ struct xcptcontext
182183

183184
uint32_t saved_pc;
184185
uint32_t saved_flags;
186+
#endif
185187
};
186188
#endif
187189

arch/or1k/src/mor1kx/Make.defs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ CMN_CSRCS = or1k_initialize.c \
3232
or1k_stackframe.c \
3333
or1k_initialstate.c \
3434
or1k_switchcontext.c \
35-
or1k_schedulesigaction.c \
3635
or1k_copyfullstate.c \
3736
or1k_registerdump.c \
3837
or1k_getintstack.c \
@@ -45,6 +44,10 @@ CMN_CSRCS = or1k_initialize.c \
4544
or1k_cpuinfo.c \
4645
mor1kx_start.c
4746

47+
ifneq ($(CONFIG_DISABLE_SIGNALS),y)
48+
CMN_CSRCS += or1k_schedulesigaction.c
49+
endif
50+
4851
ifeq ($(CONFIG_BUILD_PROTECTED),y)
4952
CMN_CSRCS += or1k_task_start.c or1k_pthread_start.c
5053
#CMN_CSRCS += or1k_signal_dispatch.c

0 commit comments

Comments
 (0)