diff options
| author | Zhai Edwin <edwin.zhai@intel.com> | 2010-08-31 16:34:09 +0800 | 
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-31 16:48:53 +0100 | 
| commit | 09bffb70def83bbca575e4f5b78b3fc949ebf517 (patch) | |
| tree | 81931295d913d229620daf6fed175b97f2025419 /meta/recipes-devtools/qemu/qemu-0.12.4/enable-i386-linux-user.patch | |
| parent | 1f0ba7c2b0429909ead5ae8fc015a827b08edf85 (diff) | |
| download | poky-09bffb70def83bbca575e4f5b78b3fc949ebf517.tar.gz | |
Add qemu-i386 in qemu-native, required by eglibc
Adding i386-linux-user in target-list is enough in theory, but our gl stuff is
not friendly to linux-user code. So disable it when compiling linux-user.
[BUGID #218] fixed by this.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu-0.12.4/enable-i386-linux-user.patch')
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu-0.12.4/enable-i386-linux-user.patch | 53 | 
1 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-0.12.4/enable-i386-linux-user.patch b/meta/recipes-devtools/qemu/qemu-0.12.4/enable-i386-linux-user.patch new file mode 100644 index 0000000000..550d48b138 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu-0.12.4/enable-i386-linux-user.patch  | |||
| @@ -0,0 +1,53 @@ | |||
| 1 | Enable i386-linux-user | ||
| 2 | |||
| 3 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
| 4 | |||
| 5 | Index: qemu-0.12.4/Makefile.target | ||
| 6 | =================================================================== | ||
| 7 | --- qemu-0.12.4.orig/Makefile.target 2010-08-31 13:57:01.000000000 +0800 | ||
| 8 | +++ qemu-0.12.4/Makefile.target 2010-08-31 14:03:06.000000000 +0800 | ||
| 9 | @@ -46,8 +46,13 @@ | ||
| 10 | libobj-$(CONFIG_NOSOFTFLOAT) += fpu/softfloat-native.o | ||
| 11 | libobj-y += op_helper.o helper.o | ||
| 12 | libobj-$(CONFIG_NEED_MMU) += mmu.o | ||
| 13 | +ifndef CONFIG_LINUX_USER | ||
| 14 | libobj-$(TARGET_I386) += helper_opengl.o opengl_exec.o | ||
| 15 | libobj-$(TARGET_X86_64) += helper_opengl.o opengl_exec.o | ||
| 16 | +else | ||
| 17 | +libobj-$(TARGET_I386) += dummygl.o | ||
| 18 | +libobj-$(TARGET_X86_64) += dummygl.o | ||
| 19 | +endif #CONFIG_LINUX_USER | ||
| 20 | libobj-$(TARGET_ARM) += dummygl.o | ||
| 21 | libobj-$(TARGET_MIPS) += dummygl.o | ||
| 22 | libobj-$(TARGET_PPC) += dummygl.o | ||
| 23 | Index: qemu-0.12.4/target-i386/dummygl.c | ||
| 24 | =================================================================== | ||
| 25 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
| 26 | +++ qemu-0.12.4/target-i386/dummygl.c 2010-08-31 15:25:25.000000000 +0800 | ||
| 27 | @@ -0,0 +1,26 @@ | ||
| 28 | +#include <string.h> | ||
| 29 | +#include <stdlib.h> | ||
| 30 | +#include <assert.h> | ||
| 31 | +#include <stdint.h> | ||
| 32 | +#include <X11/Xlib.h> | ||
| 33 | +#include <X11/Xutil.h> | ||
| 34 | + | ||
| 35 | +void opengl_exec_set_parent_window(Display* _dpy, Window _parent_window) | ||
| 36 | +{ | ||
| 37 | + | ||
| 38 | +} | ||
| 39 | + | ||
| 40 | +void opengl_process_enable(void) | ||
| 41 | +{ | ||
| 42 | + | ||
| 43 | +} | ||
| 44 | + | ||
| 45 | + | ||
| 46 | +void mem_opengl(uint64_t ptr) | ||
| 47 | +{ | ||
| 48 | + | ||
| 49 | +} | ||
| 50 | + | ||
| 51 | +void helper_opengl(void) | ||
| 52 | +{ | ||
| 53 | +} | ||
