| commit | e15f421a9acd18ca71fed382ac09f7367b6a72f6 | [log] [tgz] |
|---|---|---|
| author | Eli Friedman <eli.friedman@gmail.com> | Wed Jan 11 22:06:46 2012 +0000 |
| committer | Eli Friedman <eli.friedman@gmail.com> | Wed Jan 11 22:06:46 2012 +0000 |
| tree | 6bbac9b50843befb9b7cdbdfcc19227bc73fd173 | |
| parent | 4992881636697d3f323c06724984996f715c98ad [diff] |
Re-fix the issue Bill fixed in r147899 in a slightly different way, which doesn't abuse the semantics of linker_private. We don't really want to merge any string constant with a weak_odr global. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@147971 91177308-0d34-0410-b5e6-96231b3b80d8