partial update for compilation with arm-eabi-4.7