I've committed the attached patch, per https://gcc.gnu.org/pipermail/gcc/2024-April/243749.html -Sandra