Merge pull request #21839 from mhei/php8-fix-riscv64