gcc: merge upstream fix for PR 83496 (fixes FS#814)