Fix up r331244 - the emitted definition is weak_odr linkage. Should get

the build bots to healthy again without a full revert. As the
functionality added has nothing to do with linkage this seems unlikely
to represent a deep or interesting bug in the patch.

llvm-svn: 331245