Commit 71ea2e01 authored by Blue Swirl's avatar Blue Swirl
Browse files

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: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 9cc85c28

Makefile.target

+1 −1
Original line number Diff line number Diff line
@@ -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

oslib-posix.c

+3 −0
Original line number Diff line number Diff line
@@ -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)

{