aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld/ChangeLog6
-rw-r--r--ld/scripttempl/ft32.sc4
2 files changed, 9 insertions, 1 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 826ea7c..cd6f04c 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2016-07-06 James Bowman <james.bowman@ftdichip.com>
+
+ * scripttempl/ft32.sc (__PMSIZE): Correct __PMSIZE_.
+ (DATA): add ALIGN.
+ (BSS): add ALIGN
+
2016-07-05 H.J. Lu <hongjiu.lu@intel.com>
* testsuite/ld-plugin/lto.exp: Add -flto to PR ld/20321 test.
diff --git a/ld/scripttempl/ft32.sc b/ld/scripttempl/ft32.sc
index 15f8335..7119652 100644
--- a/ld/scripttempl/ft32.sc
+++ b/ld/scripttempl/ft32.sc
@@ -15,7 +15,7 @@ OUTPUT_ARCH(${ARCH})
${LIB_SEARCH_DIRS}
/* Allow the command line to override the memory region sizes. */
-__PMSIZE_ = DEFINED(__PMSIZE) ? __PMSIZE : 256K;
+__PMSIZE = DEFINED(__PMSIZE) ? __PMSIZE : 256K;
__RAMSIZE = DEFINED(__RAMSIZE) ? __RAMSIZE : 64K;
MEMORY
@@ -43,6 +43,7 @@ SECTIONS
*(.rodata)
*(.rodata*)
${RELOCATING+ _edata = . ; }
+ . = ALIGN(4);
} ${RELOCATING+ > ram}
.bss ${RELOCATING+ SIZEOF(.data) + ADDR(.data)} :
{
@@ -50,6 +51,7 @@ SECTIONS
*(.bss)
*(COMMON)
${RELOCATING+ _end = . ; }
+ . = ALIGN(4);
} ${RELOCATING+ > ram}
${RELOCATING+ __data_load_start = LOADADDR(.data); }