Merge from mainline to fix linking problem.

llvm-svn: 31647
1 file changed