Patch from info from Daniel Malea that should fix the build on linux after fixes committed with revision 162860.

llvm-svn: 163139
2 files changed