Re-fix the issue Bill fixed in r147899 in a slightly different way, which doesn't...
authorEli Friedman <eli.friedman@gmail.com>
Wed, 11 Jan 2012 22:06:46 +0000 (22:06 +0000)
committerEli Friedman <eli.friedman@gmail.com>
Wed, 11 Jan 2012 22:06:46 +0000 (22:06 +0000)
commite15f421a9acd18ca71fed382ac09f7367b6a72f6
tree6bbac9b50843befb9b7cdbdfcc19227bc73fd173
parent4992881636697d3f323c06724984996f715c98ad
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
include/llvm/GlobalValue.h
lib/Transforms/IPO/ConstantMerge.cpp