Get this booting with gcc 4.8+
All credits to ivanich for finding the flag. I've only modified
it to allow us to keep compiling with 4.7.

Change-Id: I4677ab5ccdbe19715f15da50217a72b2deeee2fd