[PATCH] D29640: [ELF] - Linkerscript - fix handling of OUTPUT_ARCH command.

[George Rimar via Phabricator via llvm-commits]

grimar updated this revision to Diff 87467.
grimar edited the summary of this revision.
grimar added a comment.

- Addressed review comments.


https://reviews.llvm.org/D29640

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


Index: test/ELF/linkerscript/outputarch.s
===================================================================
--- test/ELF/linkerscript/outputarch.s
+++ test/ELF/linkerscript/outputarch.s
@@ -4,6 +4,6 @@
 # RUN: ld.lld -shared -o %t2 %t1 %t.script
 # RUN: llvm-readobj %t2 > /dev/null
 
-# RUN: echo "OUTPUT_ARCH(x, y)" > %t.script
+# RUN: echo "OUTPUT_ARCH(All data written here is ignored)" > %t.script
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-freebsd %s -o %t1
-# RUN: not ld.lld -shared -o %t2 %t1 %t.script
+# RUN: ld.lld -shared -o %t2 %t1 %t.script
Index: ELF/LinkerScript.cpp
===================================================================
--- ELF/LinkerScript.cpp
+++ ELF/LinkerScript.cpp
@@ -1246,10 +1246,10 @@
 }
 
 void ScriptParser::readOutputArch() {
-  // Error checking only for now.
+  // Ignore expression for now.
   expect("(");
-  skip();
-  expect(")");
+  while (!Error && !consume(")"))
+    skip();
 }
 
 void ScriptParser::readOutputFormat() {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D29640.87467.patch
Type: text/x-patch
Size: 987 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170207/354a830f/attachment.bin>