haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

bsd-user: fix build

Browse source 
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>
This commit is contained in:
Blue Swirl 2012-06-24 20:15:05 +00:00
parent 9cc85c281b
commit 71ea2e0161
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.target
View file

@ -108,7 +108,7 @@ ifdef CONFIG_BSD_USER
QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH) QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH)
obj-y += bsd-user/ 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 endif #CONFIG_BSD_USER

3
oslib-posix.c
View file

@ -105,6 +105,8 @@ void *qemu_memalign(size_t alignment, size_t size)
return ptr; return ptr;
} }
/* conflicts with qemu_vmalloc in bsd-user/mmap.c */
#if !defined(CONFIG_BSD_USER)
/* alloc shared memory pages */ /* alloc shared memory pages */
void *qemu_vmalloc(size_t size) void *qemu_vmalloc(size_t size)
{ {
@ -127,6 +129,7 @@ void *qemu_vmalloc(size_t size)
trace_qemu_vmalloc(size, ptr); trace_qemu_vmalloc(size, ptr);
return ptr; return ptr;
} }
#endif
void qemu_vfree(void *ptr) void qemu_vfree(void *ptr)
{ {