Add tool_osdep.c

osdep.c is built in both as a toplevel target independant object, and
as a per-target object because of kqemu dependencies.  Under some
circumstances make picks up the wrong one.

Build the former as tool-osdep to avoid this conflict.
Signed-off-by: NPaul Brook <paul@codesourcery.com>

Makefile

@@ -222,11 +222,11 @@ libqemu_user.a: $(USER_OBJS)
 
 ######################################################################
 
-qemu-img$(EXESUF): qemu-img.o qemu-tool.o osdep.o $(BLOCK_OBJS)
+qemu-img$(EXESUF): qemu-img.o qemu-tool.o tool-osdep.o $(BLOCK_OBJS)
 
-qemu-nbd$(EXESUF):  qemu-nbd.o qemu-tool.o osdep.o $(BLOCK_OBJS)
+qemu-nbd$(EXESUF):  qemu-nbd.o qemu-tool.o tool-osdep.o $(BLOCK_OBJS)
 
-qemu-io$(EXESUF):  qemu-io.o qemu-tool.o osdep.o cmd.o $(BLOCK_OBJS)
+qemu-io$(EXESUF):  qemu-io.o qemu-tool.o tool-osdep.o cmd.o $(BLOCK_OBJS)
 
 qemu-img$(EXESUF) qemu-nbd$(EXESUF) qemu-io$(EXESUF): LIBS += -lz
 

osdep.c

@@ -33,6 +33,9 @@
 #include <sys/statvfs.h>
 #endif
 
+/* FIXME: This file should be target independent. However it has kqemu
+   hacks, so must be built for every target.  */
+
 /* Needed early for HOST_BSD etc. */
 #include "config-host.h"
 

tool-osdep.c

+/* Hack to provide a version of osdep.o for qemu-img without conflicting with
+   the (kqemu) target specific osdep.o.  */
+#include "osdep.c"
+