Revert "optimize for Linaro toolchain"

This reverts commit 17949fcc79146a8c0f348b9d38564230053e211a.