direct-io.hg

changeset 13656:78b7ec4e7b86

Fix compat build for weird solaris gcc target.
Signed-off-by: John Levon <john.levon@sun.com>
author kaf24@localhost.localdomain
date Sun Jan 28 16:05:07 2007 +0000 (2007-01-28)
parents fbe161b1af16
children bef8a8b1e400
files xen/include/Makefile xen/include/public/foreign/mkheader.py xen/tools/compat-build-header.py
line diff
     1.1 --- a/xen/include/Makefile	Sun Jan 28 09:47:22 2007 +0000
     1.2 +++ b/xen/include/Makefile	Sun Jan 28 16:05:07 2007 +0000
     1.3 @@ -30,8 +30,8 @@ cppflags-y                := -include pu
     1.4  cppflags-$(CONFIG_X86)    += -m32
     1.5  
     1.6  # 8-byte types are 4-byte aligned on x86_32 ...
     1.7 -prefix-$(CONFIG_X86)      := \#pragma pack(push, 4)
     1.8 -suffix-$(CONFIG_X86)      := \#pragma pack(pop)
     1.9 +prefix-$(CONFIG_X86)      := \#pragma pack(4)
    1.10 +suffix-$(CONFIG_X86)      := \#pragma pack()
    1.11  
    1.12  endif
    1.13  
     2.1 --- a/xen/include/public/foreign/mkheader.py	Sun Jan 28 09:47:22 2007 +0000
     2.2 +++ b/xen/include/public/foreign/mkheader.py	Sun Jan 28 16:05:07 2007 +0000
     2.3 @@ -24,10 +24,10 @@ inttypes["x86_32"] = {
     2.4  };
     2.5  header["x86_32"] = """
     2.6  #define __i386___X86_32 1
     2.7 -#pragma pack(push, 4)
     2.8 +#pragma pack(4)
     2.9  """;
    2.10  footer["x86_32"] = """
    2.11 -#pragma pack(pop)
    2.12 +#pragma pack()
    2.13  """;
    2.14  
    2.15  # x86_64
     3.1 --- a/xen/tools/compat-build-header.py	Sun Jan 28 09:47:22 2007 +0000
     3.2 +++ b/xen/tools/compat-build-header.py	Sun Jan 28 16:05:07 2007 +0000
     3.3 @@ -3,7 +3,7 @@
     3.4  import re,sys
     3.5  
     3.6  pats = [
     3.7 - [ r"__InClUdE__", r"#include" ],
     3.8 + [ r"__InClUdE__(.*)", r"#include\1\n#pragma pack(4)" ],
     3.9   [ r"\"xen-compat.h\"", r"<public/xen-compat.h>" ],
    3.10   [ r"(struct|union|enum)\s+(xen_?)?(\w)", r"\1 compat_\3" ],
    3.11   [ r"@KeeP@", r"" ],