FreeCalypso > hg > fc-selenite

changeset 113:16703b3fb211

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gcc linker script m4 magic minor fix
author Mychaela Falconia <falcon@freecalypso.org>
date Sat, 13 Oct 2018 18:45:15 +0000
parents fdecfb3bd860
children 8a15878740c1
files gcc/flash.m4 gcc/ld-script.src gcc/xram.m4
diffstat 3 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gcc/flash.m4	Sat Oct 13 16:56:22 2018 +0000
+++ b/gcc/flash.m4	Sat Oct 13 18:45:15 2018 +0000
@@ -1,2 +1,3 @@
 define(`Buildmem',`FLASH')dnl
 define(`Put_in_flash',`AT> FLASH')dnl
+define(`INTTEXT_BASE_ADDR',FLASHIMAGE_BASE_ADDR)dnl
--- a/gcc/ld-script.src	Sat Oct 13 16:56:22 2018 +0000
+++ b/gcc/ld-script.src	Sat Oct 13 18:45:15 2018 +0000
@@ -39,9 +39,6 @@
 	__romswitch_size = SIZEOF(bootrom.switch);
 ')dnl
 
-define(`INTTEXT_BASE_ADDR',
-    ifelse(Buildmem,FLASH,FLASHIMAGE_BASE_ADDR,`/* no fixed address */'))dnl
-
 	/* boot entry code, going into flash or XRAM emulating flash */
 	.inttext INTTEXT_BASE_ADDR : {
 		*(.inttext)
--- a/gcc/xram.m4	Sat Oct 13 16:56:22 2018 +0000
+++ b/gcc/xram.m4	Sat Oct 13 18:45:15 2018 +0000
@@ -1,2 +1,3 @@
 define(`Buildmem',`XRAM')dnl
 define(`Put_in_flash',`/* no AT> for RAM-only build */')dnl
+define(`INTTEXT_BASE_ADDR',`/* no fixed address */')dnl