Re-applied r198807, r198808 with an additional change to fix linking in configure Release+Asserts build.

llvm-svn: 198875
5 files changed