[upstream] Add gcc patch for upstream changes.