commit 80810287c3bd9f965294dd8997bdac729c8c831f
author Simon Atanasyan <simon@atanasyan.com> Mon Sep 23 20:32:43 2019 +0000
committer Simon Atanasyan <simon@atanasyan.com> Mon Sep 23 20:32:43 2019 +0000
tree 5c168b2b89f10a3448756667643e0e35fa998e62
parent fd5c35f04067d38e0c71c2ee90c3e0b24cc5b602

[mips] Support elf32btsmipn32_fbsd / elf32ltsmipn32_fbsd emulations

Patch by Kyle Evans.

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

ELF/Driver.cpp

diff --git a/ELF/Driver.cpp b/ELF/Driver.cpp
index 21be17e..bae0479 100644
--- a/ELF/Driver.cpp
+++ b/ELF/Driver.cpp
@@ -978,7 +978,8 @@
     StringRef s = arg->getValue();
     std::tie(config->ekind, config->emachine, config->osabi) =
         parseEmulation(s);
-    config->mipsN32Abi = (s == "elf32btsmipn32" || s == "elf32ltsmipn32");
+    config->mipsN32Abi =
+        (s.startswith("elf32btsmipn32") || s.startswith("elf32ltsmipn32"));
     config->emulation = s;
   }
 

test/ELF/emulation-mips.s

diff --git a/test/ELF/emulation-mips.s b/test/ELF/emulation-mips.s
index b468e8f..f6b04ca 100644
--- a/test/ELF/emulation-mips.s
+++ b/test/ELF/emulation-mips.s
@@ -90,6 +90,9 @@
 # RUN: ld.lld -m elf32btsmipn32 -e _start %tmipsn32 -o %t2mipsn32
 # RUN: llvm-readobj --file-headers %t2mipsn32 \
 # RUN:   | FileCheck -DOSABI=SystemV --check-prefix=MIPSN32 %s
+# RUN: ld.lld -m elf32btsmipn32_fbsd -e _start %tmipsn32 -o %t2mipsn32
+# RUN: llvm-readobj --file-headers %t2mipsn32 \
+# RUN:   | FileCheck -DOSABI=FreeBSD --check-prefix=MIPSN32 %s
 # RUN: ld.lld %tmipsn32 -e _start -o %t3mipsn32
 # RUN: llvm-readobj --file-headers %t3mipsn32 \
 # RUN:   | FileCheck -DOSABI=SystemV --check-prefix=MIPSN32 %s
@@ -127,6 +130,9 @@
 # RUN: ld.lld -m elf32ltsmipn32 -e _start %tmipsn32el -o %t2mipsn32el
 # RUN: llvm-readobj --file-headers %t2mipsn32el \
 # RUN:   | FileCheck -DOSABI=SystemV --check-prefix=MIPSN32EL %s
+# RUN: ld.lld -m elf32ltsmipn32_fbsd -e _start %tmipsn32el -o %t2mipsn32el
+# RUN: llvm-readobj --file-headers %t2mipsn32el \
+# RUN:   | FileCheck -DOSABI=FreeBSD --check-prefix=MIPSN32EL %s
 # RUN: ld.lld -melf32ltsmipn32 -e _start %tmipsn32el -o %t2mipsn32el
 # RUN: llvm-readobj --file-headers %t2mipsn32el \
 # RUN:   | FileCheck -DOSABI=SystemV --check-prefix=MIPSN32EL %s