Sync with Ports Tree (GCC build fix for 8.4).