[lld] r352851 - Merging r352435:

[Hans Wennborg via llvm-commits]

Author: hans
Date: Fri Feb  1 02:46:13 2019
New Revision: 352851

URL: http://llvm.org/viewvc/llvm-project?rev=352851&view=rev
Log:
Merging r352435:
------------------------------------------------------------------------
r352435 | ruiu | 2019-01-28 22:45:50 +0100 (Mon, 28 Jan 2019) | 1 line

Attempt to fix build failure with GCC 5.4.
------------------------------------------------------------------------

Modified:
    lld/branches/release_80/   (props changed)
    lld/branches/release_80/ELF/ScriptParser.cpp

Propchange: lld/branches/release_80/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb  1 02:46:13 2019
@@ -1 +1 @@
-/lld/trunk:351326,351335,351898-351899,352068,352082,352257,352302,352407,352413,352459
+/lld/trunk:351326,351335,351898-351899,352068,352082,352257,352302,352407,352413,352435,352459

Modified: lld/branches/release_80/ELF/ScriptParser.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_80/ELF/ScriptParser.cpp?rev=352851&r1=352850&r2=352851&view=diff
==============================================================================
--- lld/branches/release_80/ELF/ScriptParser.cpp (original)
+++ lld/branches/release_80/ELF/ScriptParser.cpp Fri Feb  1 02:46:13 2019
@@ -385,8 +385,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})