aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2012-06-24 20:15:05 +0000
committerBlue Swirl <blauwirbel@gmail.com>2012-06-28 20:28:36 +0000
commit71ea2e016131a9fcde6f1ffd3e0e34a64c21f593 (patch)
treeb141e349c3d8bc04fe4658262b30cbde1ae64f88
parent9cc85c281bb034bb9343b6d6803e3d01d0861514 (diff)
downloadqemu-arm-71ea2e016131a9fcde6f1ffd3e0e34a64c21f593.tar.gz
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 <blauwirbel@gmail.com>
-rw-r--r--Makefile.target2
-rw-r--r--oslib-posix.c3
2 files changed, 4 insertions, 1 deletions
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)
{