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: Paul Brook <paul@codesourcery.com>

diff --git a/Makefile b/Makefile
index 8649938..e996a99 100644 (file)
--- a/Makefile
+++ b/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
 

diff --git a/osdep.c b/osdep.c
index 3696601..b300ba1 100644 (file)
--- a/osdep.c
+++ b/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"
 

diff --git a/tool-osdep.c b/tool-osdep.c
new file mode 100644 (file)
index 0000000..24e6edf
--- /dev/null
+++ b/tool-osdep.c
@@ -0,0 +1,4 @@
+/* Hack to provide a version of osdep.o for qemu-img without conflicting with
+   the (kqemu) target specific osdep.o.  */
+#include "osdep.c"
+