aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog5
-rw-r--r--ld/ld.texinfo7
2 files changed, 9 insertions, 3 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index d1b819b..e040329 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-03 Andrew Burgess <andrew.burgess@embecosm.com>
+
+ * ld.texinfo (MEMORY): Explain that multiple MEMORY commands are
+ acceptable.
+
2015-07-29 H.J. Lu <hongjiu.lu@intel.com>
* lexsup.c (parse_args): Don't set link_info.executable to
diff --git a/ld/ld.texinfo b/ld/ld.texinfo
index b48396d..8a7a08f 100644
--- a/ld/ld.texinfo
+++ b/ld/ld.texinfo
@@ -4970,9 +4970,10 @@ set section addresses based on the memory regions, and will warn about
regions that become too full. The linker will not shuffle sections
around to fit into the available regions.
-A linker script may contain at most one use of the @code{MEMORY}
-command. However, you can define as many blocks of memory within it as
-you wish. The syntax is:
+A linker script may contain many uses of the @code{MEMORY} command,
+however, all memory blocks defined are treated as if they were
+specified inside a single @code{MEMORY} command. The syntax for
+@code{MEMORY} is:
@smallexample
@group
MEMORY