wip commit of patch for gcc 5