summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGalina Kistanova <gkistanova@gmail.com>2018-11-03 05:25:49 +0000
committerGalina Kistanova <gkistanova@gmail.com>2018-11-03 05:25:49 +0000
commit4ec5d67e49a5df9381b30470b68ebf0d01545dc0 (patch)
tree8583831615f7f7e29886dc53dbf2895668ba5d15
parent3c617b2c239432ac98a738d515338c63be9aa320 (diff)
downloadbcm5719-llvm-4ec5d67e49a5df9381b30470b68ebf0d01545dc0.tar.gz
bcm5719-llvm-4ec5d67e49a5df9381b30470b68ebf0d01545dc0.zip
Handle OUTPUT_FORMAT arguments in quotation marks
llvm-svn: 346068
-rw-r--r--lld/ELF/ScriptParser.cpp2
-rw-r--r--lld/test/ELF/format-binary.test6
2 files changed, 7 insertions, 1 deletions
diff --git a/lld/ELF/ScriptParser.cpp b/lld/ELF/ScriptParser.cpp
index 2b9de7e2887..b1802111eaf 100644
--- a/lld/ELF/ScriptParser.cpp
+++ b/lld/ELF/ScriptParser.cpp
@@ -384,7 +384,7 @@ void ScriptParser::readOutputArch() {
}
std::pair<ELFKind, uint16_t> ScriptParser::readBfdName() {
- StringRef S = next();
+ StringRef S = unquote(next());
if (S == "elf32-i386")
return {ELF32LEKind, EM_386};
if (S == "elf32-iamcu")
diff --git a/lld/test/ELF/format-binary.test b/lld/test/ELF/format-binary.test
index 311cd773a40..7c554bb60e4 100644
--- a/lld/test/ELF/format-binary.test
+++ b/lld/test/ELF/format-binary.test
@@ -61,3 +61,9 @@
# RUN: llvm-readobj %t.out -sections -section-data -symbols | FileCheck -check-prefix=X86-64 %s
# X86-64: Format: ELF64-x86-64
+
+# RUN: echo 'OUTPUT_FORMAT("elf64-x86-64")' > %t.script
+# RUN: ld.lld -b binary %t.binary -T %t.script -o %t.out
+# RUN: llvm-readobj %t.out -sections -section-data -symbols | FileCheck -check-prefix=X86-64-in-quotes %s
+
+# X86-64-in-quotes: Format: ELF64-x86-64
OpenPOWER on IntegriCloud