maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[llvm-lipo] Relax the check of the specified input file architecture 

cctools lipo only compares the cputypes when it verifies that
the specified (via -arch) input file and the architecture match.
This diff adjusts the behavior of llvm-lipo accordingly. 

Differential revision: https://reviews.llvm.org/D68319

Test plan: make check-all

llvm-svn: 373966
This commit is contained in:
Alexander Shaposhnikov 2019-10-07 21:14:22 +00:00
parent 1097fab1cf
commit f5d700ac05
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
llvm/tools/llvm-lipo/llvm-lipo.cpp
View File

@ -23,6 +23,7 @@
#include "llvm/Support/FileOutputBuffer.h"
#include "llvm/Support/InitLLVM.h"
#include "llvm/Support/WithColor.h"
#include "llvm/TextAPI/MachO/Architecture.h"
using namespace llvm;
using namespace llvm::object;
@ -438,14 +439,19 @@ readInputBinaries(ArrayRef<InputFile> InputFiles) {
if (!B->isArchive() && !B->isMachO() && !B->isMachOUniversalBinary())
reportError("File " + IF.FileName + " has unsupported binary format");
if (IF.ArchType && (B->isMachO() || B->isArchive())) {
const auto ArchType =
B->isMachO() ? Slice(cast<MachOObjectFile>(B)).getArchString()
: Slice(cast<Archive>(B)).getArchString();
if (Triple(*IF.ArchType).getArch() != Triple(ArchType).getArch())
const auto S = B->isMachO() ? Slice(cast<MachOObjectFile>(B))
: Slice(cast<Archive>(B));
const auto SpecifiedCPUType =
MachO::getCPUTypeFromArchitecture(
MachO::mapToArchitecture(Triple(*IF.ArchType)))
.first;
// For compatibility with cctools' lipo the comparison is relaxed just to
// checking cputypes.
if (S.getCPUType() != SpecifiedCPUType)
reportError("specified architecture: " + *IF.ArchType +
" for file: " + B->getFileName() +
" does not match the file's architecture (" + ArchType +
")");
" does not match the file's architecture (" +
S.getArchString() + ")");
}
InputBinaries.push_back(std::move(*BinaryOrErr));
}