diff options
| author | Georg-Johann Lay <avr@gjlay.de> | 2024-02-08 11:39:53 +0100 |
|---|---|---|
| committer | Georg-Johann Lay <avr@gjlay.de> | 2024-02-08 11:41:43 +0100 |
| commit | e515d813f080fb4c4e70d3c7b01815a909893688 (patch) | |
| tree | b4bf092afe95330cea1f36d2358488b293da48d6 /gcc | |
| parent | 5bd96fed4ff5bc480c7af2e650b16198e7e527cc (diff) | |
| download | gcc-e515d813f080fb4c4e70d3c7b01815a909893688.zip gcc-e515d813f080fb4c4e70d3c7b01815a909893688.tar.gz gcc-e515d813f080fb4c4e70d3c7b01815a909893688.tar.bz2 | |
AVR: Always define __AVR_PM_BASE_ADDRESS__ in specs provided the core has it.
gcc/
* config/avr/gen-avr-mmcu-specs.cc (print_mcu) <*cpp_mcu>: Spec always
defines __AVR_PM_BASE_ADDRESS__ if the core has it.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/config/avr/gen-avr-mmcu-specs.cc | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/gcc/config/avr/gen-avr-mmcu-specs.cc b/gcc/config/avr/gen-avr-mmcu-specs.cc index 06d9d3c..41ebfa82 100644 --- a/gcc/config/avr/gen-avr-mmcu-specs.cc +++ b/gcc/config/avr/gen-avr-mmcu-specs.cc @@ -199,13 +199,21 @@ print_mcu (const avr_mcu_t *mcu) bool flmap = (mcu->dev_attribute & AVR_ISA_FLMAP); bool is_arch = mcu->macro == NULL; bool is_device = ! is_arch; - int flash_pm_offset = 0; + int rodata_pm_offset = 0; + int pm_base_address = 0; if (arch->flash_pm_offset && mcu->flash_pm_offset && mcu->flash_pm_offset != arch->flash_pm_offset) { - flash_pm_offset = mcu->flash_pm_offset; + rodata_pm_offset = mcu->flash_pm_offset; + } + + if (arch->flash_pm_offset) + { + pm_base_address = mcu->flash_pm_offset + ? mcu->flash_pm_offset + : arch->flash_pm_offset; } if (is_arch @@ -339,8 +347,8 @@ print_mcu (const avr_mcu_t *mcu) fprintf (f, "*link_arch:\n\t%s", link_arch_spec); if (is_device - && flash_pm_offset) - fprintf (f, " --defsym=__RODATA_PM_OFFSET__=0x%x", flash_pm_offset); + && rodata_pm_offset) + fprintf (f, " --defsym=__RODATA_PM_OFFSET__=0x%x", rodata_pm_offset); fprintf (f, "\n\n"); if (is_device) @@ -381,10 +389,10 @@ print_mcu (const avr_mcu_t *mcu) fprintf (f, "*cpp_mcu:\n"); fprintf (f, "\t-D%s", mcu->macro); - if (flash_pm_offset) + if (pm_base_address) { fprintf (f, " -U__AVR_PM_BASE_ADDRESS__"); - fprintf (f, " -D__AVR_PM_BASE_ADDRESS__=0x%x", flash_pm_offset); + fprintf (f, " -D__AVR_PM_BASE_ADDRESS__=0x%x", pm_base_address); } if (have_flmap) fprintf (f, " -D__AVR_HAVE_FLMAP__"); |