diff options
Diffstat (limited to 'llvm/tools/llvm-objdump/MachODump.cpp')
| -rw-r--r-- | llvm/tools/llvm-objdump/MachODump.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp index 153edfab52c..657f3624739 100644 --- a/llvm/tools/llvm-objdump/MachODump.cpp +++ b/llvm/tools/llvm-objdump/MachODump.cpp @@ -475,12 +475,12 @@ static void printMachOUniversalHeaders(const object::MachOUniversalBinary *UB, MachOUniversalBinary::ObjectForArch other_OFA(UB, j); uint32_t other_cputype = other_OFA.getCPUType(); uint32_t other_cpusubtype = other_OFA.getCPUSubType(); - if (cputype != 0 && cpusubtype != 0 && - cputype == other_cputype && + if (cputype != 0 && cpusubtype != 0 && cputype == other_cputype && (cpusubtype & ~MachO::CPU_SUBTYPE_MASK) == - (other_cpusubtype & ~MachO::CPU_SUBTYPE_MASK)) + (other_cpusubtype & ~MachO::CPU_SUBTYPE_MASK)) { outs() << "(illegal duplicate architecture) "; break; + } } if (verbose) { outs() << OFA.getArchTypeName() << "\n"; @@ -611,11 +611,11 @@ void llvm::ParseInputMachO(StringRef Filename) { // No architecture flags were specified so if this contains a slice that // matches the host architecture dump only that. if (!ArchAll) { - StringRef HostArchName = MachOObjectFile::getHostArch().getArchName(); for (MachOUniversalBinary::object_iterator I = UB->begin_objects(), E = UB->end_objects(); I != E; ++I) { - if (HostArchName == I->getArchTypeName()) { + if (MachOObjectFile::getHostArch().getArchName() == + I->getArchTypeName()) { ErrorOr<std::unique_ptr<ObjectFile>> ObjOrErr = I->getAsObjectFile(); std::string ArchiveName; ArchiveName.clear(); |
