Backported upstream patch. Added extra one for clang64. Added clang32 where this was tested. Signed-off-by: Rosen Penev <rosenp@gmail.com>