[PATCH] D35751: llvm-mt: handle initial merge, not considering namespaces.

[Eric Beckmann via Phabricator via llvm-commits]

ecbeckmann created this revision.
Herald added subscribers: hiraditya, mgorny.

This patch does a simple merge, where "mergeable" elements are combined, and
all others are simply appended.  This does not yet apply the tricky namespace
rules.


https://reviews.llvm.org/D35751

Files:
  llvm/cmake/config-ix.cmake
  llvm/include/llvm/Support/WindowsManifestMerger.h
  llvm/lib/Support/CMakeLists.txt
  llvm/lib/Support/WindowsManifestMerger.cpp
  llvm/test/CMakeLists.txt
  llvm/test/tools/llvm-mt/Inputs/additional.manifest
  llvm/test/tools/llvm-mt/Inputs/conflicting.manifest
  llvm/test/tools/llvm-mt/Inputs/test_manifest.manifest
  llvm/test/tools/llvm-mt/conflicting.test
  llvm/test/tools/llvm-mt/simple_merge.test
  llvm/tools/llvm-mt/llvm-mt.cpp

-------------- next part --------------
A non-text attachment was scrubbed...
Name: D35751.107762.patch
Type: text/x-patch
Size: 12911 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170722/c21824b5/attachment.bin>