[all-commits] [llvm/llvm-project] 366df1: [lld-macho] Rework mergeFlag to behave closer to w...

[Vy Nguyen via All-commits]

  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: 366df11a35392c946678f1af94038945c23f06c8
      https://github.com/llvm/llvm-project/commit/366df11a35392c946678f1af94038945c23f06c8
  Author: Vy Nguyen <vyng at google.com>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M lld/MachO/ConcatOutputSection.cpp
    M lld/MachO/ConcatOutputSection.h
    M lld/test/MachO/builtin-rename.s

  Log Message:
  -----------
  [lld-macho] Rework mergeFlag to behave closer to what ld64 does.

Details:
I've been getting a few weird errors similar to the following from our internal tests:

```
ld64.lld.darwinnew: error: Cannot merge section __eh_frame (type=0x0) into __eh_frame (type=0xB): inconsistent types
ld64.lld.darwinnew: error: Cannot merge section __eh_frame (flags=0x0) into __eh_frame (flags=0x6800000B): strict flags differ
ld64.lld.darwinnew: error: Cannot merge section __eh_frame (type=0x0) into __eh_frame (type=0xB): inconsistent types
ld64.lld.darwinnew: error: Cannot merge section __eh_frame (flags=0x0) into __eh_frame (flags=0x6800000B): strict flags differ
```

Differential Revision: https://reviews.llvm.org/D103971