Here is another solution for

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88282

   less hackish than original one.

   The patch was bootstrapped and tested on x86/x86-64/ppc64/aarch64.

   Committed as rev. 266862.