michaelh/zephyr
1
0
Fork 0
Code Releases Activity

linker: remove asterisk from IRQ/ISR section name macro

Browse source 
Both _IRQ_VECTOR_TABLE_SECTION_NAME and _SW_ISR_TABLE_SECTION_NAME
are defined with asterisk at the end in an attempt to include
all related symbols in the linker script. However, these two
macros are also being used in the source code to specify
the destination sections for variables. Asterisks in the name
results in older GCC (4.x) complaining about those asterisks.
So create new macros for use in linker script, and keep
the names asterisk free.

Fixes #29936

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
Daniel Leung 2021-01-25 11:05:33 -08:00 • committed by Anas Nashif
commit 0d099bdd54
6 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/arc/core/vector_table.ld
View file

@ -8,4 +8,4 @@
KEEP(*(.exc_vector_table))
KEEP(*(".exc_vector_table.*"))
KEEP(*(_IRQ_VECTOR_TABLE_SECTION_NAME))
KEEP(*(_IRQ_VECTOR_TABLE_SECTION_SYMS))

2
arch/arm/core/aarch32/vector_table.ld
View file

@ -32,7 +32,7 @@ _vector_start = .;
KEEP(*(.exc_vector_table))
KEEP(*(".exc_vector_table.*"))
KEEP(*(_IRQ_VECTOR_TABLE_SECTION_NAME))
KEEP(*(_IRQ_VECTOR_TABLE_SECTION_SYMS))
KEEP(*(.vectors))

2
include/arch/arm/aarch64/scripts/linker.ld
View file

@ -171,7 +171,7 @@ SECTIONS
SECTION_PROLOGUE(_RODATA_SECTION_NAME,,)
{
KEEP(*(_IRQ_VECTOR_TABLE_SECTION_NAME))
KEEP(*(_IRQ_VECTOR_TABLE_SECTION_SYMS))
KEEP(*(.openocd_dbg))
KEEP(*(".openocd_dbg.*"))

2
include/linker/common-ram.ld
View file

@ -9,7 +9,7 @@
* instruction. See include/sw_isr_table.h.
*/
. = ALIGN(CONFIG_ARCH_SW_ISR_TABLE_ALIGN);
*(_SW_ISR_TABLE_SECTION_NAME)
*(_SW_ISR_TABLE_SECTION_SYMS)
} GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
#endif

2
include/linker/common-rom.ld
View file

@ -26,7 +26,7 @@
* instruction. See include/sw_isr_table.h.
*/
. = ALIGN(CONFIG_ARCH_SW_ISR_TABLE_ALIGN);
*(_SW_ISR_TABLE_SECTION_NAME)
*(_SW_ISR_TABLE_SECTION_SYMS)
} GROUP_LINK_IN(ROMABLE_REGION)
#endif

7
include/linker/sections.h
View file

@ -31,8 +31,11 @@
#define _UNDEFINED_SECTION_NAME undefined
/* Interrupts */
#define _IRQ_VECTOR_TABLE_SECTION_NAME .gnu.linkonce.irq_vector_table*
#define _SW_ISR_TABLE_SECTION_NAME .gnu.linkonce.sw_isr_table*
#define _IRQ_VECTOR_TABLE_SECTION_NAME .gnu.linkonce.irq_vector_table
#define _IRQ_VECTOR_TABLE_SECTION_SYMS .gnu.linkonce.irq_vector_table*
#define _SW_ISR_TABLE_SECTION_NAME .gnu.linkonce.sw_isr_table
#define _SW_ISR_TABLE_SECTION_SYMS .gnu.linkonce.sw_isr_table*
/* Architecture-specific sections */
#if defined(CONFIG_ARM)