[PATCH] D29276: [ELF] - Linkerscript: do not fail on additional semicolons in linkerscript.

[George Rimar via Phabricator via llvm-commits]

grimar created this revision.

Linux kernel linkerscript contains additional semicolon (last line):

  .apicdrivers : AT(ADDR(.apicdrivers) - LOAD_OFFSET) {
    __apicdrivers = .;
    *(.apicdrivers);

I checked that both gold and bfd are able to parse something like:

  .text : { ;;*(.text);;S = 0;; } }

Patch do the same.


https://reviews.llvm.org/D29276

Files:
  ELF/LinkerScript.cpp
  test/ELF/linkerscript/sections.s


Index: test/ELF/linkerscript/sections.s
===================================================================
--- test/ELF/linkerscript/sections.s
+++ test/ELF/linkerscript/sections.s
@@ -93,6 +93,11 @@
 # SEC-MULTI: 6 .shstrtab     00000035 {{[0-9a-f]*}}
 # SEC-MULTI: 7 .strtab       00000008 {{[0-9a-f]*}}
 
+# Input section pattern contains additional semicolon.
+# Case found in linux kernel script. Check we are able to parse it.
+# RUN: echo "SECTIONS { .text : { ;;*(.text);;S = 0;; } }" > %t.script
+# RUN: ld.lld -o /dev/null --script %t.script %t
+
 .globl _start
 _start:
     mov $60, %rax
Index: ELF/LinkerScript.cpp
===================================================================
--- ELF/LinkerScript.cpp
+++ ELF/LinkerScript.cpp
@@ -1493,7 +1493,10 @@
 
   while (!Error && !consume("}")) {
     StringRef Tok = next();
-    if (SymbolAssignment *Assignment = readProvideOrAssignment(Tok)) {
+    if (Tok == ";") {
+      // Commands may contain excessive additional semicolons around.
+      // We should be able to parse it.
+    } else if (SymbolAssignment *Assignment = readProvideOrAssignment(Tok)) {
       Cmd->Commands.emplace_back(Assignment);
     } else if (BytesDataCommand *Data = readBytesDataCommand(Tok)) {
       Cmd->Commands.emplace_back(Data);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D29276.86266.patch
Type: text/x-patch
Size: 1282 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170130/4acef267/attachment.bin>