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

[George Rimar via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL294432: [ELF] - Linkerscript - fix handling of OUTPUT_ARCH command. (authored by grimar).

Changed prior to commit:
  https://reviews.llvm.org/D29640?vs=87468&id=87619#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D29640

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


Index: lld/trunk/test/ELF/linkerscript/outputarch.s
===================================================================
--- lld/trunk/test/ELF/linkerscript/outputarch.s
+++ lld/trunk/test/ELF/linkerscript/outputarch.s
@@ -1,9 +1,4 @@
 # REQUIRES: x86
-# RUN: echo "OUTPUT_ARCH(x)" > %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: ld.lld -shared -o %t2 %t1 %t.script
-# RUN: llvm-readobj %t2 > /dev/null
-
-# RUN: echo "OUTPUT_ARCH(x, y)" > %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
Index: lld/trunk/ELF/LinkerScript.cpp
===================================================================
--- lld/trunk/ELF/LinkerScript.cpp
+++ lld/trunk/ELF/LinkerScript.cpp
@@ -1247,10 +1247,10 @@
 }
 
 void ScriptParser::readOutputArch() {
-  // Error checking only for now.
+  // OUTPUT_ARCH is ignored for now.
   expect("(");
-  skip();
-  expect(")");
+  while (!Error && !consume(")"))
+    skip();
 }
 
 void ScriptParser::readOutputFormat() {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D29640.87619.patch
Type: text/x-patch
Size: 1138 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170208/1ec79385/attachment.bin>