From: kaf24@localhost.localdomain <kaf24@localhost.localdomain>
Date: Sun, 28 Jan 2007 16:05:07 +0000 (+0000)
Subject: Fix compat build for weird solaris gcc target.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15371^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=164e5bc9b7c69961ce321ceed81907b7540474ea;p=xen.git

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 66319d908b..8d6d57e55d 100644
--- 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 d08bcb80f3..a5310eb8b5 100644
--- 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 6fb795eaaa..c802f60e3c 100755
--- 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"" ],