forked from OSchip/llvm-project
ef7267def6
The following changes enable llvm-ifs to handle the following merge conflicts: * Weak + Strong symbol merging for the same symbol * empty vs non-empty triple field * empty vs non-empty object file format Differential Revision: https://reviews.llvm.org/D70834 |
||
|---|---|---|
| .. | ||
| Inputs | ||
| conflict-header-format.ifs | ||
| conflict-header-triple.ifs | ||
| conflict-header-version.ifs | ||
| conflict-size.ifs | ||
| conflict-type.ifs | ||
| conflict-weak.ifs | ||
| default-empty.ifs | ||
| func.ifs | ||
| ios-tbd.ifs | ||
| lit.local.cfg | ||
| macos-tbd.ifs | ||
| object-function-size-weak-combo.ifs | ||
| object.ifs | ||
| strong.ifs | ||
| tvos-tbd.ifs | ||
| version-ok.ifs | ||
| watchos-tbd.ifs | ||
| weak-mismatch.ifs | ||
| weak.ifs | ||