[lld] r347750 - Fix build error.

Haojian Wu via llvm-commits llvm-commits at lists.llvm.org
Wed Nov 28 05:15:06 PST 2018


Author: hokein
Date: Wed Nov 28 05:15:06 2018
New Revision: 347750

URL: http://llvm.org/viewvc/llvm-project?rev=347750&view=rev
Log:
Fix build error.

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=347750&r1=347749&r2=347750&view=diff
==============================================================================
--- lld/trunk/ELF/ScriptParser.cpp (original)
+++ lld/trunk/ELF/ScriptParser.cpp Wed Nov 28 05:15:06 2018
@@ -388,36 +388,36 @@ void ScriptParser::readOutputArch() {
 std::tuple<ELFKind, uint16_t, bool> ScriptParser::readBfdName() {
   StringRef S = unquote(next());
   if (S == "elf32-i386")
-    return {ELF32LEKind, EM_386, false};
+    return std::make_tuple(ELF32LEKind, EM_386, false);
   if (S == "elf32-iamcu")
-    return {ELF32LEKind, EM_IAMCU, false};
+    return std::make_tuple(ELF32LEKind, EM_IAMCU, false);
   if (S == "elf32-littlearm")
-    return {ELF32LEKind, EM_ARM, false};
+    return std::make_tuple(ELF32LEKind, EM_ARM, false);
   if (S == "elf32-x86-64")
-    return {ELF32LEKind, EM_X86_64, false};
+    return std::make_tuple(ELF32LEKind, EM_X86_64, false);
   if (S == "elf64-littleaarch64")
-    return {ELF64LEKind, EM_AARCH64, false};
+    return std::make_tuple(ELF64LEKind, EM_AARCH64, false);
   if (S == "elf64-powerpc")
-    return {ELF64BEKind, EM_PPC64, false};
+    return std::make_tuple(ELF64BEKind, EM_PPC64, false);
   if (S == "elf64-powerpcle")
-    return {ELF64LEKind, EM_PPC64, false};
+    return std::make_tuple(ELF64LEKind, EM_PPC64, false);
   if (S == "elf64-x86-64")
-    return {ELF64LEKind, EM_X86_64, false};
+    return std::make_tuple(ELF64LEKind, EM_X86_64, false);
   if (S == "elf32-tradbigmips")
-    return {ELF32BEKind, EM_MIPS, false};
+    return std::make_tuple(ELF32BEKind, EM_MIPS, false);
   if (S == "elf32-ntradbigmips")
-    return {ELF32BEKind, EM_MIPS, true};
+    return std::make_tuple(LF32BEKind, EM_MIPS, true);
   if (S == "elf32-tradlittlemips")
-    return {ELF32LEKind, EM_MIPS, false};
+    return std::make_tuple(ELF32LEKind, EM_MIPS, false);
   if (S == "elf32-ntradlittlemips")
-    return {ELF32LEKind, EM_MIPS, true};
+    return std::make_tuple(ELF32LEKind, EM_MIPS, true);
   if (S == "elf64-tradbigmips")
-    return {ELF64BEKind, EM_MIPS, false};
+    return std::make_tuple(ELF64BEKind, EM_MIPS, false);
   if (S == "elf64-tradlittlemips")
-    return {ELF64LEKind, EM_MIPS, false};
+    return std::make_tuple(ELF64LEKind, EM_MIPS, false);
 
   setError("unknown output format name: " + S);
-  return {ELFNoneKind, EM_NONE, false};
+  return std::make_tuple(ELFNoneKind, EM_NONE, false);
 }
 
 // Parse OUTPUT_FORMAT(bfdname) or OUTPUT_FORMAT(bfdname, big, little).




More information about the llvm-commits mailing list