Re: Fix build of stable-4.16.5 and 4.14.37 with GCC 8.0.1