| From db1cf96ebd1c8b8749b4c5b4461aac5af98558ea Mon Sep 17 00:00:00 2001 |
| From: Andrew Hsieh <andrewhsieh@google.com> |
| Date: Tue, 14 Jan 2014 14:45:14 -0800 |
| Subject: [PATCH 1/3] Fixed darwin ld.mcld GNU -m emulation fail |
| |
| Change-Id: I95fb07db7b58db94328f24a46f8e6b292c38dd21 |
| --- |
| tools/lite/lib/TripleOptions.cpp | 4 ++-- |
| tools/mcld/main.cpp | 4 ++-- |
| 2 files changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/tools/lite/lib/TripleOptions.cpp b/tools/lite/lib/TripleOptions.cpp |
| index 20ab3b1..3a20e2b 100644 |
| --- a/tools/lite/lib/TripleOptions.cpp |
| +++ b/tools/lite/lib/TripleOptions.cpp |
| @@ -85,12 +85,12 @@ ParseEmulation(llvm::Triple& pTriple, const std::string& pEmulation) |
| { |
| llvm::Triple triple = llvm::StringSwitch<llvm::Triple>(pEmulation) |
| .Case("armelf_linux_eabi", llvm::Triple("arm", "", "linux", "gnueabi")) |
| - .Case("elf_i386", llvm::Triple("i386", "", "", "gnu")) |
| + .Case("elf_i386", llvm::Triple("i386", "", "linux", "gnu")) |
| .Case("elf_x86_64", llvm::Triple("x86_64", "", "", "gnu")) |
| .Case("elf32_x86_64", llvm::Triple("x86_64", "", "", "gnux32")) |
| .Case("elf_i386_fbsd", llvm::Triple("i386", "", "freebsd", "gnu")) |
| .Case("elf_x86_64_fbsd", llvm::Triple("x86_64", "", "freebsd", "gnu")) |
| - .Case("elf32ltsmip", llvm::Triple("mipsel", "", "", "gnu")) |
| + .Case("elf32ltsmip", llvm::Triple("mipsel", "", "linux", "gnu")) |
| .Default(llvm::Triple()); |
| |
| if (triple.getArch() == llvm::Triple::UnknownArch && |
| diff --git a/tools/mcld/main.cpp b/tools/mcld/main.cpp |
| index dcb8140..854aaa9 100644 |
| --- a/tools/mcld/main.cpp |
| +++ b/tools/mcld/main.cpp |
| @@ -1037,12 +1037,12 @@ static Triple ParseEmulation(const std::string& pEmulation) |
| { |
| Triple result = StringSwitch<Triple>(pEmulation) |
| .Case("armelf_linux_eabi", Triple("arm", "", "linux", "gnueabi")) |
| - .Case("elf_i386", Triple("i386", "", "", "gnu")) |
| + .Case("elf_i386", Triple("i386", "", "linux", "gnu")) |
| .Case("elf_x86_64", Triple("x86_64", "", "", "gnu")) |
| .Case("elf32_x86_64", Triple("x86_64", "", "", "gnux32")) |
| .Case("elf_i386_fbsd", Triple("i386", "", "freebsd", "gnu")) |
| .Case("elf_x86_64_fbsd", Triple("x86_64", "", "freebsd", "gnu")) |
| - .Case("elf32ltsmip", Triple("mipsel", "", "", "gnu")) |
| + .Case("elf32ltsmip", Triple("mipsel", "", "linux", "gnu")) |
| .Default(Triple()); |
| |
| if (result.getArch() == Triple::UnknownArch && |
| -- |
| 1.8.5.2 |
| |
