Move some things into arch-specific makefile