procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AVR: Always define __AVR_PM_BASE_ADDRESS__ in specs provided the core has it.

Browse source 
gcc/
	* config/avr/gen-avr-mmcu-specs.cc (print_mcu) <*cpp_mcu>: Spec always
	defines __AVR_PM_BASE_ADDRESS__ if the core has it.
This commit is contained in:
Georg-Johann Lay 2024-02-08 11:39:53 +01:00
parent 5bd96fed4f
commit e515d813f0
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gcc/config/avr/gen-avr-mmcu-specs.cc
View file

@ -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__");