[Xen-changelog] [xen-unstable] Fix compat build for weird solaris gcc target.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxxx
# Date 1170000307 0
# Node ID 78b7ec4e7b8635c13b7911fb30afe16c38f5b775
# Parent  fbe161b1af160a605878c7f18c42f4e1a9d1e55f
Fix compat build for weird solaris gcc target.
Signed-off-by: John Levon <john.levon@xxxxxxx>
---
 xen/include/Makefile                   |    4 ++--
 xen/include/public/foreign/mkheader.py |    4 ++--
 xen/tools/compat-build-header.py       |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff -r fbe161b1af16 -r 78b7ec4e7b86 xen/include/Makefile
--- a/xen/include/Makefile      Sun Jan 28 09:47:22 2007 +0000
+++ b/xen/include/Makefile      Sun Jan 28 16:05:07 2007 +0000
@@ -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 -r fbe161b1af16 -r 78b7ec4e7b86 xen/include/public/foreign/mkheader.py
--- a/xen/include/public/foreign/mkheader.py    Sun Jan 28 09:47:22 2007 +0000
+++ b/xen/include/public/foreign/mkheader.py    Sun Jan 28 16:05:07 2007 +0000
@@ -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 -r fbe161b1af16 -r 78b7ec4e7b86 xen/tools/compat-build-header.py
--- a/xen/tools/compat-build-header.py  Sun Jan 28 09:47:22 2007 +0000
+++ b/xen/tools/compat-build-header.py  Sun Jan 28 16:05:07 2007 +0000
@@ -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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog