[lld] 52a118d - Revert "Reland [lld-macho] Fix bug in reading cpuSubType field."

[Roman Lebedev via llvm-commits]

Reminder to please always mention the reason for the revert in the
commit message.

On Fri, Dec 9, 2022 at 11:07 PM Vy Nguyen via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
>
>
> Author: Vy Nguyen
> Date: 2022-12-09T15:07:08-05:00
> New Revision: 52a118d08fbb0a45cba8c34346d9ccb14f599c6a
>
> URL: https://github.com/llvm/llvm-project/commit/52a118d08fbb0a45cba8c34346d9ccb14f599c6a
> DIFF: https://github.com/llvm/llvm-project/commit/52a118d08fbb0a45cba8c34346d9ccb14f599c6a.diff
>
> LOG: Revert "Reland [lld-macho] Fix bug in reading cpuSubType field."
>
> This reverts commit f472da190b65a1db2512960ee5334889a6663aef.
>
> Added:
>
>
> Modified:
>     lld/MachO/InputFiles.cpp
>     lld/test/MachO/fat-arch.s
>
> Removed:
>
>
>
> ################################################################################
> diff  --git a/lld/MachO/InputFiles.cpp b/lld/MachO/InputFiles.cpp
> index b7a8c91250ded..7fb5594aa97cf 100644
> --- a/lld/MachO/InputFiles.cpp
> +++ b/lld/MachO/InputFiles.cpp
> @@ -231,14 +231,8 @@ std::optional<MemoryBufferRef> macho::readFile(StringRef path) {
>        return std::nullopt;
>      }
>
> -    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<uint32_t>(target->cpuType) ||
> -        cpuSubtype != target->cpuSubtype)
> +    if (read32be(&arch[i].cputype) != static_cast<uint32_t>(target->cpuType) ||
> +        read32be(&arch[i].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
> index de9099ab31b0f..33928b1049be1 100644
> --- a/lld/test/MachO/fat-arch.s
> +++ b/lld/test/MachO/fat-arch.s
> @@ -1,32 +1,16 @@
> -# REQUIRES: x86,aarch64
> -## FIXME: The tests doesn't run on windows right now because of llvm-mc (can't produce triple=arm64-apple-macos11.0)
> -# UNSUPPORTED: system-windows
> -
> +# 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: %lld %t.x86_64.o -bundle_loader %t.fat.exec.out -bundle -o %t.fat.bundle
> -
> -# RUN: llvm-otool -h %t.fat.exec.out %t.fat.bundle| FileCheck %s --check-prefix=CPU-SUB
> -# CPU-SUB:            magic     cputype      cpusubtype   caps      filetype   ncmds sizeofcmds      flags
> -# CPU-SUB-NEXT:  0xfeedfacf   [[#CPU:]]   [[#CPU_SUB:]]   0x{{.+}}    {{.+}}  {{.+}}    {{.+}}      {{.+}}
> -# CPU-SUB-NEXT: Mach header
> -# CPU-SUB-NEXT:       magic     cputype       cpusubtype       caps    filetype ncmds sizeofcmds      flags
> -# CPU-SUB-NEXT:  0xfeedfacf    [[#CPU]]     [[#CPU_SUB]]   0x{{.+}}    {{.+}}  {{.+}}    {{.+}}      {{.+}}
> -
>  .text
>  .global _main
>  _main:
> +  mov $0, %eax
>    ret
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits