Revert "Revert "Revert "Makefile: add some optimization flags for ARM"""

This reverts commit 5eeb499a55fa0d5fd7c38f51e263698ea60acdbb.
arch/arm/kernel/armksyms: fix merge derp

Signed-off-by: Paul Reioux <reioux@gmail.com>

Conflicts:
	arch/arm/kernel/armksyms.c
Revert "arch/arm/kernel/armksyms: fix merge derp"

This reverts commit 051af213dce38cb81df57ff17a61979146930cc5.
arch/arm/kernel/armksyms: fix merge derp

Signed-off-by: Paul Reioux <reioux@gmail.com>

Conflicts:
	arch/arm/kernel/armksyms.c