[lld] r352435 - Attempt to fix build failure with GCC 5.4.
Rui Ueyama via llvm-commits
llvm-commits at lists.llvm.org
Mon Jan 28 13:45:50 PST 2019
Author: ruiu
Date: Mon Jan 28 13:45:50 2019
New Revision: 352435
URL: http://llvm.org/viewvc/llvm-project?rev=352435&view=rev
Log:
Attempt to fix build failure with GCC 5.4.
Modified:
lld/trunk/ELF/ScriptParser.cpp
Modified: lld/trunk/ELF/ScriptParser.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/ScriptParser.cpp?rev=352435&r1=352434&r2=352435&view=diff
==============================================================================
--- lld/trunk/ELF/ScriptParser.cpp (original)
+++ lld/trunk/ELF/ScriptParser.cpp Mon Jan 28 13:45:50 2019
@@ -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})
More information about the llvm-commits
mailing list