diff --git a/lld/MachO/InputFiles.cpp b/lld/MachO/InputFiles.cpp --- a/lld/MachO/InputFiles.cpp +++ b/lld/MachO/InputFiles.cpp @@ -231,8 +231,14 @@ return std::nullopt; } - if (read32be(&arch[i].cputype) != static_cast(target->cpuType) || - read32be(&arch[i].cpusubtype) != target->cpuSubtype) + uint32_t cpuType = read32be(&arch[i].cputype); + uint32_t cpuSubtype = + read32be(&arch[i].cpusubtype) & ~MachO::CPU_SUBTYPE_MASK; + + // FIXME: LD64 has a more complex fallback logic here. + // Consider implementing that as well? + if (cpuType != static_cast(target->cpuType) || + cpuSubtype != target->cpuSubtype) continue; uint32_t offset = read32be(&arch[i].offset); diff --git a/lld/test/MachO/fat-arch.s b/lld/test/MachO/fat-arch.s --- a/lld/test/MachO/fat-arch.s +++ b/lld/test/MachO/fat-arch.s @@ -1,16 +1,30 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=i386-apple-darwin %s -o %t.i386.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.x86_64.o +# RUN: llvm-mc -filetype=obj -triple=arm64-apple-macos11.0 %s -o %t.arm64.o + # RUN: llvm-lipo %t.i386.o %t.x86_64.o -create -o %t.fat.o # RUN: %lld -o /dev/null %t.fat.o - # RUN: llvm-lipo %t.i386.o -create -o %t.noarch.o # RUN: not %lld -o /dev/null %t.noarch.o 2>&1 | \ # RUN: FileCheck %s -DFILE=%t.noarch.o # CHECK: error: unable to find matching architecture in [[FILE]] +## Validates that we read the cpu-subtype correctly from a fat exec. +# RUN: %lld -o %t.x86_64.out %t.x86_64.o +# RUN: %lld -arch arm64 -o %t.arm64.out %t.arm64.o +# RUN: llvm-lipo %t.x86_64.out %t.arm64.out -create -o %t.fat.exec.out + +# RUN: llvm-otool -h %t.fat.exec.out | FileCheck %s --check-prefix=PRE-COND +# PRE-COND: magic cputype cpusubtype caps filetype ncmds sizeofcmds flags +# PRE-COND-NEXT: 0xfeedfacf 16777223 3 0x80 2 13 648 0x00200085 + +# RUN: %lld %t.x86_64.o -bundle_loader %t.fat.exec.out -bundle -o %t.fat.bundle +# RUN: llvm-otool -h %t.fat.bundle | FileCheck %s --check-prefix=POST-COND +# POST-COND: magic cputype cpusubtype caps filetype ncmds sizeofcmds flags +# POST-COND-NEXT: 0xfeedfacf 16777223 3 0x00 8 10 520 0x00000085 + .text .global _main _main: - mov $0, %eax ret