diff options
| author | Jacek Caban <jacek@codeweavers.com> | 2024-02-24 17:43:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-24 17:43:59 +0100 |
| commit | 8a5aa103c52265337b43330e55e05567046f3ede (patch) | |
| tree | f717565bfb17f97e8d9d5acbe242c37830ac0ea2 /llvm/lib/Object/Archive.cpp | |
| parent | cf9201cfdbc10f4606fc4ca22bf1ccaf5ee841b3 (diff) | |
| download | llvm-8a5aa103c52265337b43330e55e05567046f3ede.zip llvm-8a5aa103c52265337b43330e55e05567046f3ede.tar.gz llvm-8a5aa103c52265337b43330e55e05567046f3ede.tar.bz2 | |
Revert "[llvm-ar] Use COFF archive format for COFF targets." (#82889)
Reverts llvm/llvm-project#82642 for
lld/test/ELF/invalid/Output/data-encoding.test.tmp.a failures on
Windows.
Diffstat (limited to 'llvm/lib/Object/Archive.cpp')
| -rw-r--r-- | llvm/lib/Object/Archive.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/llvm/lib/Object/Archive.cpp b/llvm/lib/Object/Archive.cpp index d3fdcd9..e447e5b 100644 --- a/llvm/lib/Object/Archive.cpp +++ b/llvm/lib/Object/Archive.cpp @@ -969,19 +969,12 @@ Archive::Archive(MemoryBufferRef Source, Error &Err) Err = Error::success(); } -object::Archive::Kind Archive::getDefaultKindForTriple(Triple &T) { - if (T.isOSDarwin()) - return object::Archive::K_DARWIN; - if (T.isOSAIX()) - return object::Archive::K_AIXBIG; - if (T.isOSWindows()) - return object::Archive::K_COFF; - return object::Archive::K_GNU; -} - object::Archive::Kind Archive::getDefaultKindForHost() { Triple HostTriple(sys::getProcessTriple()); - return getDefaultKindForTriple(HostTriple); + return HostTriple.isOSDarwin() + ? object::Archive::K_DARWIN + : (HostTriple.isOSAIX() ? object::Archive::K_AIXBIG + : object::Archive::K_GNU); } Archive::child_iterator Archive::child_begin(Error &Err, |