From 214d91c19d6db45a47469c39b98f83a37cbb8039 Mon Sep 17 00:00:00 2001 From: Watson Zeng Date: Thu, 20 May 2021 15:00:25 +0800 Subject: [PATCH] toolchain: arcmwdt: linker: fix placeholders for arcmwdt toolchain syntax ". += length;" not work with arcmwdt toolchain, let's using ". = . + length;", which both work with gnu and arcmwdt toolchain. Signed-off-by: Watson Zeng --- include/linker/kobject-data.ld | 4 ++-- include/linker/kobject-priv-stacks.ld | 2 +- include/linker/kobject-rom.ld | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linker/kobject-data.ld b/include/linker/kobject-data.ld index bb258158c45..8ad0b51cb0e 100644 --- a/include/linker/kobject-data.ld +++ b/include/linker/kobject-data.ld @@ -15,7 +15,7 @@ #ifdef CONFIG_DYNAMIC_OBJECTS PROVIDE(_thread_idx_map = .); - . += CONFIG_MAX_THREAD_BYTES; + . = . + CONFIG_MAX_THREAD_BYTES; #endif #endif /* !LINKER_ZEPHYR_PREBUILT && !LINKER_ZEPHYR_FINAL */ @@ -40,7 +40,7 @@ #endif #ifdef KOBJECT_DATA_ALIGN . = ALIGN(KOBJECT_DATA_ALIGN); - . += KOBJECT_DATA_SZ; + . = . + KOBJECT_DATA_SZ; #endif #endif /* LINKER_ZEPHYR_PREBUILT */ diff --git a/include/linker/kobject-priv-stacks.ld b/include/linker/kobject-priv-stacks.ld index 94861db22cd..35f170aecb1 100644 --- a/include/linker/kobject-priv-stacks.ld +++ b/include/linker/kobject-priv-stacks.ld @@ -23,7 +23,7 @@ #include #ifdef KOBJECT_PRIV_STACKS_ALIGN . = ALIGN(KOBJECT_PRIV_STACKS_ALIGN); - . += KOBJECT_PRIV_STACKS_SZ; + . = . + KOBJECT_PRIV_STACKS_SZ; #endif #endif /* LINKER_ZEPHYR_PREBUILT */ diff --git a/include/linker/kobject-rom.ld b/include/linker/kobject-rom.ld index 4b03bc8565c..b4f9218386b 100644 --- a/include/linker/kobject-rom.ld +++ b/include/linker/kobject-rom.ld @@ -22,7 +22,7 @@ _kobject_rodata_area_start = .; - . += KOBJECT_RODATA_SZ; + . = . + KOBJECT_RODATA_SZ; _kobject_rodata_area_end = .; #endif