diff options
| author | Nick Kledzik <kledzik@apple.com> | 2013-01-15 00:17:57 +0000 |
|---|---|---|
| committer | Nick Kledzik <kledzik@apple.com> | 2013-01-15 00:17:57 +0000 |
| commit | 233f5377999892630b8869a6010638b5d9b6ddc7 (patch) | |
| tree | 45e61291693a01d4e4efb033610d7baaf21f0602 /lld/lib/ReaderWriter | |
| parent | cb8a9a61f4355578cbc3f45aacfcbb27e30023fc (diff) | |
| download | bcm5719-llvm-233f5377999892630b8869a6010638b5d9b6ddc7.tar.gz bcm5719-llvm-233f5377999892630b8869a6010638b5d9b6ddc7.zip | |
Add new merge-by-content Merge attribute for use by anonymous
constants and string literals which the linker should coalesce.
llvm-svn: 172495
Diffstat (limited to 'lld/lib/ReaderWriter')
| -rw-r--r-- | lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp b/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp index 0581c2e056a..310e8b41654 100644 --- a/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp +++ b/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp @@ -351,6 +351,7 @@ struct ScalarEnumerationTraits<lld::DefinedAtom::Merge> { io.enumCase(value, "as-weak", lld::DefinedAtom::mergeAsWeak); io.enumCase(value, "as-addressed-weak", lld::DefinedAtom::mergeAsWeakAndAddressUsed); + io.enumCase(value, "by-content", lld::DefinedAtom::mergeByContent); } }; |
