Merged trunk revision 210608 into hsa branch



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/hsa@210721 138bc75d-0d04-0410-961f-82ee72b054a4