patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

Revert "interrupts: use weak linkage instead ..."

Browse source 
This reverts commit 140863f6a7.

This was found to be causing problems with certain linkers which
generate different code depending on whether a symbol is weak or
not.

Fixes #11916

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2018-12-07 13:47:23 -08:00 committed by Anas Nashif
parent cd255744d0
commit ce8e1ecd2d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/common/isr_tables.c
View file

@ -48,7 +48,7 @@ u32_t __irq_vector_table _irq_vector_table[IRQ_TABLE_SIZE] = {
* type and bypass the _sw_isr_table, then do not generate one. * type and bypass the _sw_isr_table, then do not generate one.
*/ */
#ifdef CONFIG_GEN_SW_ISR_TABLE #ifdef CONFIG_GEN_SW_ISR_TABLE
struct _isr_table_entry __weak __sw_isr_table _sw_isr_table[IRQ_TABLE_SIZE] = { struct _isr_table_entry __sw_isr_table _sw_isr_table[IRQ_TABLE_SIZE] = {
[0 ...(IRQ_TABLE_SIZE - 1)] = {(void *)0x42, (void *)&_irq_spurious}, [0 ...(IRQ_TABLE_SIZE - 1)] = {(void *)0x42, (void *)&_irq_spurious},
}; };
#endif #endif

2
include/linker/sections.h
View file

@ -46,7 +46,7 @@
/* Interrupts */ /* Interrupts */
#define IRQ_VECTOR_TABLE .gnu.linkonce.irq_vector_table #define IRQ_VECTOR_TABLE .gnu.linkonce.irq_vector_table
#define SW_ISR_TABLE .sw_isr_table #define SW_ISR_TABLE .gnu.linkonce.sw_isr_table
/* Architecture-specific sections */ /* Architecture-specific sections */
#if defined(CONFIG_ARM) #if defined(CONFIG_ARM)