michaelh/zephyr
1
0
Fork 0
Code Releases Activity

debug: Clean up thread awareness data sections

Browse source 
There's no need to duplicate the linker section for each architecture.
Instead, move the section declaration to common-rom.ld.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi 2021-03-12 12:21:50 +01:00 • committed by Kumar Gala
commit 59a51f0e09
7 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,7 +38,4 @@ KEEP(*(.vectors))
_vector_end = .;
KEEP(*(.openocd_dbg))
KEEP(*(".openocd_dbg.*"))
#include "cortex_m/vector_table_pad.ld"

2
include/arch/arc/v2/linker.ld
View file

@ -101,8 +101,6 @@ SECTIONS {
#include <linker/thread-local-storage.ld>
SECTION_PROLOGUE(_RODATA_SECTION_NAME,,) {
KEEP(*(.openocd_dbg))
KEEP(*(".openocd_dbg.*"))
*(".rodata")
*(".rodata.*")
*(.gnu.linkonce.r.*)

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

@ -162,9 +162,6 @@ SECTIONS
{
KEEP(*(_IRQ_VECTOR_TABLE_SECTION_SYMS))
KEEP(*(.openocd_dbg))
KEEP(*(".openocd_dbg.*"))
*(.rodata)
*(".rodata.*")
*(.gnu.linkonce.r.*)

2
include/arch/nios2/linker.ld
View file

@ -124,8 +124,6 @@ SECTIONS
*(.text)
*(".text.*")
*(.gnu.linkonce.t.*)
KEEP(*(.openocd_dbg))
KEEP(*(".openocd_dbg.*"))
} GROUP_LINK_IN(ROMABLE_REGION)
_image_text_end = .;

2
include/arch/x86/ia32/linker.ld
View file

@ -119,8 +119,6 @@ SECTIONS
*(.init)
*(.fini)
*(.eini)
KEEP(*(.openocd_dbg))
KEEP(*(".openocd_dbg.*"))
#include <linker/kobject-text.ld>

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

@ -185,6 +185,11 @@
Z_ITERABLE_SECTION_ROM(tracing_backend, 4)
SECTION_DATA_PROLOGUE(zephyr_dbg_info,,)
{
KEEP(*(".dbg_thread_info"));
} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
SECTION_DATA_PROLOGUE(device_handles,,)
{
__device_handles_start = .;

6
subsys/debug/thread_info.c
View file

@ -36,7 +36,7 @@ enum {
* scheme.
* Only version 1 is backward compatible to version 0.
*/
__attribute__((used, section(".openocd_dbg")))
__attribute__((used, section(".dbg_thread_info")))
size_t _kernel_thread_info_offsets[] = {
/* Version 0 starts */
[THREAD_INFO_OFFSET_VERSION] = 1,
@ -111,12 +111,12 @@ size_t _kernel_thread_info_offsets[] = {
extern size_t __attribute__((alias("_kernel_thread_info_offsets")))
_kernel_openocd_offsets;
__attribute__((used, section(".openocd_dbg")))
__attribute__((used, section(".dbg_thread_info")))
size_t _kernel_thread_info_num_offsets = ARRAY_SIZE(_kernel_thread_info_offsets);
extern size_t __attribute__((alias("_kernel_thread_info_num_offsets")))
_kernel_openocd_num_offsets;
__attribute__((used, section(".openocd_dbg")))
__attribute__((used, section(".dbg_thread_info")))
uint8_t _kernel_thread_info_size_t_size = (uint8_t)sizeof(size_t);
extern uint8_t __attribute__((alias("_kernel_thread_info_size_t_size")))
_kernel_openocd_size_t_size;