gcc patch #0:  7 fixes