Revert "fix build errrors with linaro 4.9"

This reverts commit 0b252f606296a79b365e1abb320f51e9b26d7557.
Revert "fix build with Linaro GCC 4.9.1"

This reverts commit a56dc6a8d8e239df84dc937ea4d342869464cec8.