commit 1e8e49a1bf5bc576f7092f8a4facff7915aedcfe
author Rui Ueyama <ruiu@google.com> Mon Jan 28 21:45:50 2019 +0000
committer Rui Ueyama <ruiu@google.com> Mon Jan 28 21:45:50 2019 +0000
tree df048dd2e2a2ce6608f6f0a5a85c69e6740547fc
parent 793abc38e5f243222a27ffa83a26ebd8bb83493d

Attempt to fix build failure with GCC 5.4.

git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@352435 91177308-0d34-0410-b5e6-96231b3b80d8

ELF/ScriptParser.cpp

diff --git a/ELF/ScriptParser.cpp b/ELF/ScriptParser.cpp
index 324c00e..03a66f8 100644
--- a/ELF/ScriptParser.cpp
+++ b/ELF/ScriptParser.cpp
@@ -384,8 +384,8 @@
     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})