From: Angus Gratton Date: Fri, 7 Dec 2018 04:14:58 +0000 (+1100) Subject: linker: When using section type attributes, create unique sections X-Git-Tag: v3.3-beta2~158^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=769bd4a4af7576e9a6013211eb630502aef86a40;p=esp-idf linker: When using section type attributes, create unique sections * Prevents section type conflict errors if (say) const & non-const data is put into the same section (ie with DRAM_ATTR) * Allows linker --gc-sections to remove unused custom sections --- diff --git a/components/esp32/include/esp_attr.h b/components/esp32/include/esp_attr.h index 6d2d5ea84d..e820d892ca 100644 --- a/components/esp32/include/esp_attr.h +++ b/components/esp32/include/esp_attr.h @@ -20,11 +20,11 @@ //and all variables in shared RAM. These macros can be used to redirect //particular functions/variables to other memory regions. -// Forces code into IRAM instead of flash. -#define IRAM_ATTR __attribute__((section(".iram1"))) +// Forces code into IRAM instead of flash +#define IRAM_ATTR _SECTION_ATTR_IMPL(".iram1", __COUNTER__) // Forces data into DRAM instead of flash -#define DRAM_ATTR __attribute__((section(".dram1"))) +#define DRAM_ATTR _SECTION_ATTR_IMPL(".dram1", __COUNTER__) // Forces data to be 4 bytes aligned #define WORD_ALIGNED_ATTR __attribute__((aligned(4))) @@ -37,11 +37,11 @@ #define DRAM_STR(str) (__extension__({static const DRAM_ATTR char __c[] = (str); (const char *)&__c;})) // Forces code into RTC fast memory. See "docs/deep-sleep-stub.rst" -#define RTC_IRAM_ATTR __attribute__((section(".rtc.text"))) +#define RTC_IRAM_ATTR _SECTION_ATTR_IMPL(".rtc.text", __COUNTER__) #if CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY // Forces bss variable into external memory. " -#define EXT_RAM_ATTR __attribute__((section(".ext_ram.bss"))) +#define EXT_RAM_ATTR _SECTION_ATTR_IMPL(".ext_ram.bss", __COUNTER__) #else #define EXT_RAM_ATTR #endif @@ -49,26 +49,37 @@ // Forces data into RTC slow memory. See "docs/deep-sleep-stub.rst" // Any variable marked with this attribute will keep its value // during a deep sleep / wake cycle. -#define RTC_DATA_ATTR __attribute__((section(".rtc.data"))) +#define RTC_DATA_ATTR _SECTION_ATTR_IMPL(".rtc.data", __COUNTER__) // Forces read-only data into RTC memory. See "docs/deep-sleep-stub.rst" -#define RTC_RODATA_ATTR __attribute__((section(".rtc.rodata"))) +#define RTC_RODATA_ATTR _SECTION_ATTR_IMPL(".rtc.rodata", __COUNTER__) // Allows to place data into RTC_SLOW memory. -#define RTC_SLOW_ATTR __attribute__((section(".rtc.force_slow"))) +#define RTC_SLOW_ATTR _SECTION_ATTR_IMPL(".rtc.force_slow", __COUNTER__) // Allows to place data into RTC_FAST memory. -#define RTC_FAST_ATTR __attribute__((section(".rtc.force_fast"))) +#define RTC_FAST_ATTR _SECTION_ATTR_IMPL(".rtc.force_fast", __COUNTER__) // Forces data into noinit section to avoid initialization after restart. -#define __NOINIT_ATTR __attribute__((section(".noinit"))) +#define __NOINIT_ATTR _SECTION_ATTR_IMPL(".noinit", __COUNTER__) // Forces data into RTC slow memory of .noinit section. // Any variable marked with this attribute will keep its value // after restart or during a deep sleep / wake cycle. -#define RTC_NOINIT_ATTR __attribute__((section(".rtc_noinit"))) +#define RTC_NOINIT_ATTR _SECTION_ATTR_IMPL(".rtc_noinit", __COUNTER__) // Forces to not inline function #define NOINLINE_ATTR __attribute__((noinline)) +// Implementation for a unique custom section +// +// This prevents gcc producing "x causes a section type conflict with y" +// errors if two variables in the same source file have different linkage (maybe const & non-const) but are placed in the same custom section +// +// Using unique sections also means --gc-sections can remove unused +// data with a custom section type set +#define _SECTION_ATTR_IMPL(SECTION, COUNTER) __attribute__((section(SECTION "." _COUNTER_STRINGIFY(COUNTER)))) + +#define _COUNTER_STRINGIFY(COUNTER) #COUNTER + #endif /* __ESP_ATTR_H__ */ diff --git a/components/esp32/ld/esp32_fragments.lf b/components/esp32/ld/esp32_fragments.lf index 65063f5bcb..0132a11aa4 100644 --- a/components/esp32/ld/esp32_fragments.lf +++ b/components/esp32/ld/esp32_fragments.lf @@ -21,16 +21,16 @@ entries: [sections:rtc_text] entries: - .rtc.text + .rtc.text+ .rtc.literal [sections:rtc_data] entries: - .rtc.data + .rtc.data+ [sections:rtc_rodata] entries: - .rtc.rodata + .rtc.rodata+ [sections:rtc_bss] entries: diff --git a/components/heap/heap_trace.c b/components/heap/heap_trace.c index 3c9154ef72..198480859a 100644 --- a/components/heap/heap_trace.c +++ b/components/heap/heap_trace.c @@ -421,7 +421,7 @@ IRAM_ATTR void *__wrap_heap_caps_malloc(size_t size, uint32_t caps) return trace_malloc(size, caps, TRACE_MALLOC_CAPS); } -IRAM_ATTR void __wrap_heap_caps_free(void *p) __attribute__((alias("__wrap_free"))); +void __wrap_heap_caps_free(void *p) __attribute__((alias("__wrap_free"))); IRAM_ATTR void *__wrap_heap_caps_realloc(void *p, size_t size, uint32_t caps) { diff --git a/components/newlib/locks.c b/components/newlib/locks.c index 646afd72c3..708ddab3f0 100644 --- a/components/newlib/locks.c +++ b/components/newlib/locks.c @@ -118,7 +118,7 @@ void IRAM_ATTR _lock_close(_lock_t *lock) { portEXIT_CRITICAL(&lock_init_spinlock); } -void IRAM_ATTR _lock_close_recursive(_lock_t *lock) __attribute__((alias("_lock_close"))); +void _lock_close_recursive(_lock_t *lock) __attribute__((alias("_lock_close"))); /* Acquire the mutex semaphore for lock. wait up to delay ticks. mutex_type is queueQUEUE_TYPE_RECURSIVE_MUTEX or queueQUEUE_TYPE_MUTEX diff --git a/tools/ldgen/samples/esp32.lf b/tools/ldgen/samples/esp32.lf index 03a9377011..251eb34d5c 100644 --- a/tools/ldgen/samples/esp32.lf +++ b/tools/ldgen/samples/esp32.lf @@ -21,16 +21,16 @@ entries: [sections:rtc_text] entries: - .rtc.text + .rtc.text+ .rtc.literal [sections:rtc_data] entries: - .rtc.data + .rtc.data+ [sections:rtc_rodata] entries: - .rtc.rodata + .rtc.rodata+ [sections:rtc_bss] entries: @@ -38,7 +38,7 @@ entries: [sections:extram_bss] entries: - .exram.bss + .ext_ram.bss+ [sections:iram] entries: