T6: import t6wl-3.4.10-g8a54bda
Fix the GCC errors