Conflicts:
	src/gcc.mk
	tools/patch-tool-mxe