summaryrefslogtreecommitdiffstats
path: root/lld/ELF/ScriptParser.cpp
diff options
context:
space:
mode:
authorRui Ueyama <ruiu@google.com>2019-01-28 21:45:50 +0000
committerRui Ueyama <ruiu@google.com>2019-01-28 21:45:50 +0000
commit0068d223eefa9cbff19831a16f6e80393df5156b (patch)
tree59ec5a928d6054bde8071d1c9a04b335384648b8 /lld/ELF/ScriptParser.cpp
parent2a56e97f741bf8fefa68692304a29c64f37c65b7 (diff)
downloadbcm5719-llvm-0068d223eefa9cbff19831a16f6e80393df5156b.tar.gz
bcm5719-llvm-0068d223eefa9cbff19831a16f6e80393df5156b.zip
Attempt to fix build failure with GCC 5.4.
llvm-svn: 352435
Diffstat (limited to 'lld/ELF/ScriptParser.cpp')
-rw-r--r--lld/ELF/ScriptParser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lld/ELF/ScriptParser.cpp b/lld/ELF/ScriptParser.cpp
index 324c00ee583..03a66f80a0e 100644
--- a/lld/ELF/ScriptParser.cpp
+++ b/lld/ELF/ScriptParser.cpp
@@ -384,8 +384,8 @@ void ScriptParser::readOutputArch() {
skip();
}
-static std::tuple<ELFKind, uint16_t> parseBfdName(StringRef S) {
- return StringSwitch<std::tuple<ELFKind, uint16_t>>(S)
+static std::pair<ELFKind, uint16_t> parseBfdName(StringRef S) {
+ return StringSwitch<std::pair<ELFKind, uint16_t>>(S)
.Case("elf32-i386", {ELF32LEKind, EM_386})
.Case("elf32-iamcu", {ELF32LEKind, EM_IAMCU})
.Case("elf32-littlearm", {ELF32LEKind, EM_ARM})
OpenPOWER on IntegriCloud