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/Core/Resolver.cpp | |
| 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/Core/Resolver.cpp')
| -rw-r--r-- | lld/lib/Core/Resolver.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lld/lib/Core/Resolver.cpp b/lld/lib/Core/Resolver.cpp index 8b426fae87f..7e0d2e2895b 100644 --- a/lld/lib/Core/Resolver.cpp +++ b/lld/lib/Core/Resolver.cpp @@ -110,11 +110,8 @@ void Resolver::doDefinedAtom(const DefinedAtom &atom) { // add to list of known atoms _atoms.push_back(&atom); - // non-static atoms need extra handling - if (atom.scope() != DefinedAtom::scopeTranslationUnit) { - // tell symbol table about non-static atoms - _symbolTable.add(atom); - } + // tell symbol table + _symbolTable.add(atom); if (_options.deadCodeStripping()) { // add to set of dead-strip-roots, all symbols that |
