aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2010-02-20 09:27:38 +0000
committerBlue Swirl <blauwirbel@gmail.com>2010-02-20 09:27:38 +0000
commit51464fafdfab94ee47ed4ddf2a79fef434a5c8c7 (patch)
tree1dbe5c32ed14d56f6964ec4a476a240fbc92a053
parent36828256692c3cecc83607f22761ceefc382040e (diff)
Don't compile rwhandler.c for user targets
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rw-r--r--Makefile.target2
-rw-r--r--rwhandler.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/Makefile.target b/Makefile.target
index 068408f70b..4c4d397627 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -46,7 +46,6 @@ all: $(PROGS)
# cpu emulator library
libobj-y = exec.o translate-all.o cpu-exec.o translate.o
libobj-y += tcg/tcg.o
-libobj-y += rwhandler.o
libobj-$(CONFIG_SOFTFLOAT) += fpu/softfloat.o
libobj-$(CONFIG_NOSOFTFLOAT) += fpu/softfloat-native.o
libobj-y += op_helper.o helper.o
@@ -174,6 +173,7 @@ obj-y = vl.o async.o monitor.o pci.o pci_host.o pcie_host.o machine.o gdbstub.o
# virtio has to be here due to weird dependency between PCI and virtio-net.
# need to fix this properly
obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-pci.o virtio-serial-bus.o
+obj-y += rwhandler.o
obj-$(CONFIG_KVM) += kvm.o kvm-all.o
obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
LIBS+=-lz
diff --git a/rwhandler.c b/rwhandler.c
index c50c4bf603..1f9b6db4bc 100644
--- a/rwhandler.c
+++ b/rwhandler.c
@@ -2,8 +2,6 @@
#include "ioport.h"
#include "cpu-all.h"
-#if !defined(CONFIG_USER_ONLY)
-
#define RWHANDLER_WRITE(name, len, type) \
static void name(void *opaque, type addr, uint32_t value) \
{\
@@ -87,5 +85,3 @@ int register_ioport_simple(ReadWriteHandler* handler,
}
return 0;
}
-
-#endif