maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Allow expressions in MEMORY command. 

Previously, we allowed only integers in this context. Now you can
write expressions there. LLD is now able to handle the following
linker, for example.

  MEMORY { rom (rx) : ORIGIN = (1024 * 1024) }

llvm-svn: 300131
This commit is contained in:
Rui Ueyama 2017-04-12 23:16:52 +00:00
parent e9c9edf67b
commit 040af7deab
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lld/ELF/ScriptParser.cpp
View File

@ -1102,12 +1102,7 @@ uint64_t ScriptParser::readMemoryAssignment(StringRef S1, StringRef S2,
return 0;
}
expect("=");
// TODO: Fully support constant expressions.
if (Optional<uint64_t> Val = parseInt(next()))
return *Val;
setError("nonconstant expression for " + S1);
return 0;
return readExpr()().getValue();
}
// Parse the MEMORY command as specified in:

2
lld/test/ELF/linkerscript/memory.s
View File

@ -18,7 +18,7 @@
# RUN: echo "MEMORY { \
# RUN: ram (rwx) : ORIGIN = 0, LENGTH = 1024M \
# RUN: rom (rx) : org = 0x80000000, len = 64M \
# RUN: rom (rx) : org = (0x80 * 0x1000 * 0x1000), len = 64M \
# RUN: } \
# RUN: SECTIONS { \
# RUN: .text : { *(.text) } > rom \