Handle arbitrary expressions in DATA_SEGMENT_RELRO_END.

llvm-svn: 281521
llvm · Sep 14, 2016 · 97bdc72 · 97bdc72
1 parent 01f1666
commit 97bdc72
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
@@ -1330,7 +1330,7 @@ Expr ScriptParser::readPrimary() {
   // the next page boundary for simplicity.
   if (Tok == "DATA_SEGMENT_RELRO_END") {
     expect("(");
-    next();
+    readExpr();
     expect(",");
     readExpr();
     expect(")");

diff --git a/lld/test/ELF/linkerscript/data-segment-relro.s b/lld/test/ELF/linkerscript/data-segment-relro.s
@@ -9,7 +9,7 @@
 # RUN:  . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE)); \
 # RUN:  .dynamic        : { *(.dynamic) } \
 # RUN:  .got            : { *(.got) } \
-# RUN:  . = DATA_SEGMENT_RELRO_END (24, .); \
+# RUN:  . = DATA_SEGMENT_RELRO_END (1 ? 24 : 0, .); \
 # RUN:  .got.plt : { *(.got.plt) } \
 # RUN:  .data : { *(.data) } \
 # RUN:  .bss        : { *(.bss) } \