summaryrefslogtreecommitdiffstats
path: root/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
diff options
context:
space:
mode:
authorRui Ueyama <ruiu@google.com>2014-03-07 23:05:10 +0000
committerRui Ueyama <ruiu@google.com>2014-03-07 23:05:10 +0000
commitc79dd2f80ac78b262944a55a6e8eaee3c62ea7a5 (patch)
treee19af8d81e42e51058a87d8d549e6473686f77cf /lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
parent1d6d1c88bd48f8bdcbc12c401d03ec8af65350ec (diff)
downloadbcm5719-llvm-c79dd2f80ac78b262944a55a6e8eaee3c62ea7a5.tar.gz
bcm5719-llvm-c79dd2f80ac78b262944a55a6e8eaee3c62ea7a5.zip
[PECOFF] Support a new type of weak symbol.
Summary: COMDAT_SELECT_SAME_SIZE is a COMDAT type that I presume exist only in COFF. The semantics of the type is that linker should merge such COMDAT sections if their sizes are the same. Otherwise it's an error. Reviewers: Bigcheese, shankarke, kledzik CC: llvm-commits Differential Revision: http://llvm-reviews.chandlerc.com/D2996 llvm-svn: 203308
Diffstat (limited to 'lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp')
-rw-r--r--lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp b/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
index 30ede7698a9..03a22447734 100644
--- a/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
+++ b/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
@@ -337,7 +337,9 @@ template <> 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);
+ io.enumCase(value, "by-content", lld::DefinedAtom::mergeByContent);
+ io.enumCase(value, "same-name-and-size",
+ lld::DefinedAtom::mergeSameNameAndSize);
}
};
OpenPOWER on IntegriCloud