Package: libx86 Version: 1.1+ds1-1 Severity: normal Tags: patch User: [EMAIL PROTECTED] Usertags: origin-ubuntu ubuntu-patch intrepid
The attached patch fixes libx86 to build with Linux 2.6.26-rc1 or newer, where the *_MASK definitions have been removed. See: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=a5c15d419d4b68535222b51f9054dd08d5e67470 Changelog entry: * 01-processor-flags.patch: Linux 2.6.26-rc1 and newer no longer define *_MASK; use X86_EFLAGS_* instead. Thanks, -- Colin Watson [EMAIL PROTECTED]
diff -u libx86-1.1+ds1/debian/patches/series libx86-1.1+ds1/debian/patches/series --- libx86-1.1+ds1/debian/patches/series +++ libx86-1.1+ds1/debian/patches/series @@ -1,0 +2 @@ +01-processor-flags.patch -p0 only in patch2: unchanged: --- libx86-1.1+ds1.orig/debian/patches/01-processor-flags.patch +++ libx86-1.1+ds1/debian/patches/01-processor-flags.patch @@ -0,0 +1,23 @@ +Index: lrmi.c +=================================================================== +--- lrmi.c.orig ++++ lrmi.c +@@ -55,6 +55,18 @@ + #include "x86-common.h" + + #if defined(__linux__) ++#ifndef TF_MASK ++#define TF_MASK X86_EFLAGS_TF ++#endif ++#ifndef IF_MASK ++#define IF_MASK X86_EFLAGS_IF ++#endif ++#ifndef IOPL_MASK ++#define IOPL_MASK X86_EFLAGS_IOPL ++#endif ++#ifndef VIF_MASK ++#define VIF_MASK X86_EFLAGS_VIF ++#endif + #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) + #elif defined(__NetBSD__) || defined(__FreeBSD__) + #define DEFAULT_VM86_FLAGS (PSL_I | PSL_IOPL)
