fix build with gcc -combine

3 files changed