summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/qemu/qemu/fxrstorssefix.patch31
-rw-r--r--meta/recipes-devtools/qemu/qemu_2.0.0.bb (renamed from meta/recipes-devtools/qemu/qemu_1.7.0.bb)9
2 files changed, 4 insertions, 36 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/fxrstorssefix.patch b/meta/recipes-devtools/qemu/qemu/fxrstorssefix.patch
deleted file mode 100644
index 59ab0f50fa..0000000000
--- a/meta/recipes-devtools/qemu/qemu/fxrstorssefix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1When we restore the mxcsr resgister with FXRSTOR, we need to update the various SSE
2flag files by calling update_sse_status() else we're using the flags from some other
3process with interesting results.
4
5The code isn't ordered to make this easy hence the function declaration.
6
7Upstream-Status: Pending
8
9RP 2013/9/30
10
11Index: qemu-1.5.0/target-i386/fpu_helper.c
12===================================================================
13--- qemu-1.5.0.orig/target-i386/fpu_helper.c 2013-09-30 18:46:39.283377648 +0000
14+++ qemu-1.5.0/target-i386/fpu_helper.c 2013-09-30 18:46:56.895377232 +0000
15@@ -1149,6 +1149,8 @@
16 }
17 }
18
19+static void update_sse_status(CPUX86State *env);
20+
21 void helper_fxrstor(CPUX86State *env, target_ulong ptr, int data64)
22 {
23 int i, fpus, fptag, nb_xmm_regs;
24@@ -1180,6 +1182,7 @@
25 if (env->cr[4] & CR4_OSFXSR_MASK) {
26 /* XXX: finish it */
27 env->mxcsr = cpu_ldl_data(env, ptr + 0x18);
28+ update_sse_status(env);
29 /* cpu_ldl_data(env, ptr + 0x1c); */
30 if (env->hflags & HF_CS64_MASK) {
31 nb_xmm_regs = 16;
diff --git a/meta/recipes-devtools/qemu/qemu_1.7.0.bb b/meta/recipes-devtools/qemu/qemu_2.0.0.bb
index b776cccc02..b8ce62428b 100644
--- a/meta/recipes-devtools/qemu/qemu_1.7.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.0.0.bb
@@ -3,13 +3,12 @@ require qemu.inc
3LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ 3LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
4 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" 4 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
5 5
6SRC_URI += "file://fxrstorssefix.patch \ 6SRC_URI += "file://qemu-enlarge-env-entry-size.patch \
7 file://qemu-enlarge-env-entry-size.patch \
8 file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch" 7 file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch"
9 8
10SRC_URI_prepend = "http://wiki.qemu.org/download/qemu-${PV}.tar.bz2" 9SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"
11SRC_URI[md5sum] = "32893941d40d052a5e649efcf06aca06" 10SRC_URI[md5sum] = "2790f44fd76da5de5024b4aafeb594c2"
12SRC_URI[sha256sum] = "31f333a85f2d14c605a77679904a9668eaeb1b6dc7da53a1665230f46bc21314" 11SRC_URI[sha256sum] = "60cc1aa0cad39cec891f970bed60ca8a484f071adad4943123599ac223543a3b"
13 12
14COMPATIBLE_HOST_class-target_mips64 = "null" 13COMPATIBLE_HOST_class-target_mips64 = "null"
15 14