diff options
| author | bors <bors@rust-lang.org> | 2020-02-12 16:25:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-02-12 16:25:13 +0000 |
| commit | 2d2be570970d784db5539a1d309cd22b85be910a (patch) | |
| tree | 52c9407b54a2b5c06af608699528a311406a4e78 /src/rustllvm/ArchiveWrapper.cpp | |
| parent | 2ed25f069768c046464e68fd382c867ddb04a1e3 (diff) | |
| parent | d9982f1f817e67149316b60fbacb0425e7179365 (diff) | |
Auto merge of #69094 - Dylan-DPC:rollup-4qe7uv1, r=Dylan-DPC
Rollup of 8 pull requests Successful merges: - #67585 (Improve `char::is_ascii_*` codegen) - #68914 (Speed up `SipHasher128`.) - #68994 (rustbuild: include channel in sanitizers installed name) - #69032 (ICE in nightly-2020-02-08: handle TerminatorKind::Yield in librustc_mir::transform::promote_consts::Validator method) - #69034 (parser: Remove `Parser::prev_token_kind`) - #69042 (Remove backtrace header text) - #69059 (Remove a few unused objects) - #69089 (Properly use the darwin archive format on Apple targets) Failed merges: r? @ghost
Diffstat (limited to 'src/rustllvm/ArchiveWrapper.cpp')
| -rw-r--r-- | src/rustllvm/ArchiveWrapper.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/rustllvm/ArchiveWrapper.cpp b/src/rustllvm/ArchiveWrapper.cpp index 678d787571e..93704638f83 100644 --- a/src/rustllvm/ArchiveWrapper.cpp +++ b/src/rustllvm/ArchiveWrapper.cpp @@ -38,6 +38,7 @@ enum class LLVMRustArchiveKind { Other, GNU, BSD, + DARWIN, COFF, }; @@ -47,6 +48,8 @@ static Archive::Kind fromRust(LLVMRustArchiveKind Kind) { return Archive::K_GNU; case LLVMRustArchiveKind::BSD: return Archive::K_BSD; + case LLVMRustArchiveKind::DARWIN: + return Archive::K_DARWIN; case LLVMRustArchiveKind::COFF: return Archive::K_COFF; default: |