# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1539456315 0
# Node ID 16703b3fb211cb5cf888a9789773d066dd3c0f3c
# Parent  fdecfb3bd860ca118b99cb0fe123801b8cb0438b
gcc linker script m4 magic minor fix

diff -r fdecfb3bd860 -r 16703b3fb211 gcc/flash.m4
--- 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
diff -r fdecfb3bd860 -r 16703b3fb211 gcc/ld-script.src
--- 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)
diff -r fdecfb3bd860 -r 16703b3fb211 gcc/xram.m4
--- 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