[Xen-devel] 13622:583441e296a1 adds more pragma pack push/pops

[John Levon <levon@xxxxxxxxxxxxxxxxx>]

Is it possible to get this resolved in unstable so we can build without
hacks again? Below is what I'm using to (attempt to) build.

thanks
john


# HG changeset patch
# User john.levon@xxxxxxx
# Date 1169999436 28800
# Node ID 8415b0f8d9f21dc9dde1759308ab32f999b4bf45
# Parent  a8103a6f41408e45cd9f0479fe1ce7afe078d15a
Enforce pragma pack(4) for the compat headers.

Signed-off-by: John Levon <john.levon@xxxxxxx>

diff --git a/xen/include/Makefile b/xen/include/Makefile
--- a/xen/include/Makefile
+++ b/xen/include/Makefile
@@ -30,8 +30,8 @@ cppflags-$(CONFIG_X86)    += -m32
 cppflags-$(CONFIG_X86)    += -m32
 
 # 8-byte types are 4-byte aligned on x86_32 ...
-prefix-$(CONFIG_X86)      := \#pragma pack(push, 4)
-suffix-$(CONFIG_X86)      := \#pragma pack(pop)
+prefix-$(CONFIG_X86)      := \#pragma pack(4)
+suffix-$(CONFIG_X86)      := \#pragma pack()
 
 endif
 
diff --git a/xen/include/public/foreign/mkheader.py 
b/xen/include/public/foreign/mkheader.py
--- a/xen/include/public/foreign/mkheader.py
+++ b/xen/include/public/foreign/mkheader.py
@@ -24,10 +24,10 @@ inttypes["x86_32"] = {
 };
 header["x86_32"] = """
 #define __i386___X86_32 1
-#pragma pack(push, 4)
+#pragma pack(4)
 """;
 footer["x86_32"] = """
-#pragma pack(pop)
+#pragma pack()
 """;
 
 # x86_64
diff --git a/xen/tools/compat-build-header.py b/xen/tools/compat-build-header.py
--- a/xen/tools/compat-build-header.py
+++ b/xen/tools/compat-build-header.py
@@ -3,7 +3,7 @@ import re,sys
 import re,sys
 
 pats = [
- [ r"__InClUdE__", r"#include" ],
+ [ r"__InClUdE__(.*)", r"#include\1\n#pragma pack(4)" ],
  [ r"\"xen-compat.h\"", r"<public/xen-compat.h>" ],
  [ r"(struct|union|enum)\s+(xen_?)?(\w)", r"\1 compat_\3" ],
  [ r"@KeeP@", r"" ],

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel