um: merge Makefile-{i386,x86_64}