Fix up some trivial conflicts in {i386|ia64}/Makefile
Attach a file by drag & drop or click to upload
