From 71ea2e016131a9fcde6f1ffd3e0e34a64c21f593 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sun, 24 Jun 2012 20:15:05 +0000 Subject: bsd-user: fix build Link in oslib objects also for BSD user, but avoid using the version of qemu_vmalloc() defined in oslib-posix.c. Signed-off-by: Blue Swirl --- Makefile.target | 2 +- oslib-posix.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.target b/Makefile.target index 127d573391..74f7a4a170 100644 --- a/Makefile.target +++ b/Makefile.target @@ -108,7 +108,7 @@ ifdef CONFIG_BSD_USER QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH) obj-y += bsd-user/ -obj-y += gdbstub.o user-exec.o +obj-y += gdbstub.o user-exec.o $(oslib-obj-y) endif #CONFIG_BSD_USER diff --git a/oslib-posix.c b/oslib-posix.c index b6a3c7fc55..6b7ba646c7 100644 --- a/oslib-posix.c +++ b/oslib-posix.c @@ -105,6 +105,8 @@ void *qemu_memalign(size_t alignment, size_t size) return ptr; } +/* conflicts with qemu_vmalloc in bsd-user/mmap.c */ +#if !defined(CONFIG_BSD_USER) /* alloc shared memory pages */ void *qemu_vmalloc(size_t size) { @@ -127,6 +129,7 @@ void *qemu_vmalloc(size_t size) trace_qemu_vmalloc(size, ptr); return ptr; } +#endif void qemu_vfree(void *ptr) { -- cgit v1.2.1