Fix compat build for weird solaris gcc target.

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

diff --git a/xen/include/Makefile b/xen/include/Makefile
index 66319d908b9ff59a034ab009a8431283d28d65c0..8d6d57e55d92e3624609a2ca3cb839ded65ef8a0 100644 (file)
--- a/xen/include/Makefile
+++ b/xen/include/Makefile
@@ -30,8 +30,8 @@ cppflags-y                := -include public/xen-compat.h
 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
index d08bcb80f3379ed7e10855328e16b3533a47039a..a5310eb8b56b962c107e7c8bdab8cf6e139402bb 100644 (file)
--- 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
index 6fb795eaaa093d944eed13a553ecde2fb6d405ed..c802f60e3c43c6688dcfeea808776b9514537710 100755 (executable)
--- a/xen/tools/compat-build-header.py
+++ b/xen/tools/compat-build-header.py
@@ -3,7 +3,7 @@
 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"" ],