mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-29 00:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

qemu-native: unbreak on amd64 - patch taken from OE

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2419 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Marcin Juszkiewicz
2007-08-09 10:32:03 +00:00
parent 0460e717e6
commit a21e133e77
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
meta/packages/qemu/files/qemu-amd64-32b-mapping-0.9.0.patch Normal file
View File

@@ -0,0 +1,21 @@
diff -Naru qemu-snapshot-2007-07-01_05.orig/linux-user/mmap.c qemu-snapshot-2007-07-01_05/linux-user/mmap.c
--- qemu-snapshot-2007-07-01_05.orig/linux-user/mmap.c 2007-06-03 17:31:32.000000000 +0200
+++ qemu-snapshot-2007-07-01_05/linux-user/mmap.c 2007-07-02 14:00:30.000000000 +0200
@@ -234,7 +234,7 @@
host_offset = offset & qemu_host_page_mask;
host_len = len + offset - host_offset;
host_start = (long)mmap(real_start ? g2h(real_start) : NULL,
- host_len, prot, flags, fd, host_offset);
+ host_len, prot, (flags | MAP_32BIT), fd, host_offset);
if (host_start == -1)
return host_start;
/* update start so that it points to the file position at 'offset' */
@@ -388,7 +388,7 @@
int prot;
/* XXX: use 5 args syscall */
- new_addr = (long)mremap(g2h(old_addr), old_size, new_size, flags);
+ new_addr = (long)mremap(g2h(old_addr), old_size, new_size, (flags | MAP_32BIT));
if (new_addr == -1)
return new_addr;
new_addr = h2g(new_addr);

3
meta/packages/qemu/qemu_cvs.bb
View File

@@ -1,7 +1,7 @@
LICENSE = "GPL"
DEPENDS = "zlib"
PV = "0.9.0+cvs${SRCDATE}"
PR = "r1"
PR = "r2"
FILESDIR = "${WORKDIR}"
@@ -31,6 +31,7 @@ SRC_URI = "\
file://93-oh-pl110-rgb.patch;patch=1;pnum=0 \
file://qemu-0.9.0-nptl.patch;patch=1 \
file://qemu-0.9.0-nptl-update.patch;patch=1 \
file://qemu-amd64-32b-mapping-0.9.0.patch;patch=1 \
file://fix_segfault.patch;patch=1"
# svn://svn.o-hand.com/repos/misc/trunk/qemu-packaging/qemu;module=debian;proto=http;srcdate=20070119 \