diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2006-08-10 21:29:01 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2006-08-10 21:29:01 +0000 |
| commit | 1b2c0eeba25dadf468a4a932d60aab3ef5cd99cf (patch) | |
| tree | 1e984bcbca5bfe1522db5c9b5df30eb820ea285b /app-emulation/xen-tools/files | |
| parent | replace postgresql dep with libpq, up dep on psycopg-2 to libpq-7.4 (#143444) (diff) | |
| download | gentoo-2-1b2c0eeba25dadf468a4a932d60aab3ef5cd99cf.tar.gz gentoo-2-1b2c0eeba25dadf468a4a932d60aab3ef5cd99cf.tar.bz2 gentoo-2-1b2c0eeba25dadf468a4a932d60aab3ef5cd99cf.zip | |
Fix push and pop usage for amd64, bug #142682. Disable the 32bit-only vmxassist, if we can't compile x86 32bit code, bug #138314.
(Portage version: 2.1.1_pre4-r4)
Diffstat (limited to 'app-emulation/xen-tools/files')
| -rw-r--r-- | app-emulation/xen-tools/files/xen-tools-3.0.2-bxclobber.patch | 26 | ||||
| -rw-r--r-- | app-emulation/xen-tools/files/xen-tools-3.0.2-pushpop.patch | 32 |
2 files changed, 58 insertions, 0 deletions
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-bxclobber.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-bxclobber.patch new file mode 100644 index 000000000000..8f0b5611f526 --- /dev/null +++ b/app-emulation/xen-tools/files/xen-tools-3.0.2-bxclobber.patch @@ -0,0 +1,26 @@ +# HG changeset patch +# User vhanquez@kneesa.uk.xensource.com +# Date Mon Apr 10 14:51:10 2006 +0000 +# Node ID bdec77028194e6f51872b66b0575ed86ad542333 +# parent: 07af1b34d4c49ac52faaff6cb315231655212316 +fix bug #609 - error: PIC register `bx' clobbered in `asm' + +Signed-off-by: Vincent Hanquez <vincent@xensource.com> + + +--- a/tools/ioemu/hw/vga.c Mon Apr 10 14:47:51 2006 +0100 ++++ b/tools/ioemu/hw/vga.c Mon Apr 10 14:51:10 2006 +0000 +@@ -1369,10 +1369,10 @@ static inline unsigned int cpuid_edx(uns + { + unsigned int eax, edx; + +- __asm__("cpuid" ++ __asm__("pushl %%ebx; cpuid; popl %%ebx" + : "=a" (eax), "=d" (edx) + : "0" (op) +- : "bx", "cx"); ++ : "cx"); + + return edx; + } + diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-pushpop.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-pushpop.patch new file mode 100644 index 000000000000..807e007a6aa8 --- /dev/null +++ b/app-emulation/xen-tools/files/xen-tools-3.0.2-pushpop.patch @@ -0,0 +1,32 @@ +# HG changeset patch +# User kaf24@firebug.cl.cam.ac.uk +# Date Mon Apr 10 17:25:42 2006 +0100 +# Node ID c89d62e7015a25a48225daa929616a5ed44205b4 +# parent: 4088dd0856a9cbc7ef050d7272e81666b7dfbcc7 +Fix push/pop usage in tools/ioemu for x86/64. + +Signed-off-by: Keir Fraser <keir@xensource.com> + + + +--- a/tools/ioemu/hw/vga.c Mon Apr 10 17:16:25 2006 +0100 ++++ b/tools/ioemu/hw/vga.c Mon Apr 10 17:25:42 2006 +0100 +@@ -1369,10 +1369,16 @@ static inline unsigned int cpuid_edx(uns + { + unsigned int eax, edx; + +- __asm__("pushl %%ebx; cpuid; popl %%ebx" ++#ifdef __x86_64__ ++#define __bx "rbx" ++#else ++#define __bx "ebx" ++#endif ++ __asm__("push %%"__bx"; cpuid; pop %%"__bx + : "=a" (eax), "=d" (edx) + : "0" (op) + : "cx"); ++#undef __ebx + + return edx; + } + |