[Xen-devel] [PATCH v2 for-4.7 06/14] xen/tools: fix substitution of __align8__ uint64_t inside of headers

[Roger Pau Monne <roger.pau@xxxxxxxxxx>]

The current seedery doesn't work with BSD sed, so remove the try to match
int64_t also (since there's none at the moment). Also, apply the same
treatment to all arch headers, currently this is only done to x86_64
headers.

Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Cc: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 tools/include/xen-foreign/Makefile | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/tools/include/xen-foreign/Makefile 
b/tools/include/xen-foreign/Makefile
index 270a975..e395011 100644
--- a/tools/include/xen-foreign/Makefile
+++ b/tools/include/xen-foreign/Makefile
@@ -25,18 +25,30 @@ check-headers: checker
        rm tmp.size
 
 arm32.h: mkheader.py structs.py $(ROOT)/arch-arm.h $(ROOT)/xen.h
-       $(PYTHON) $< $* $@ $(filter %.h,$^)
+       $(PYTHON) $< $* $@.tmp $(filter %.h,$^)
+       #Avoid mixing an alignment directive with a uint64_t cast or sizeof 
expression
+       sed 's/(__align8__ \(uint64_t\))/(\1)/g' < $@.tmp > $@.tmp2
+       rm $@.tmp
+       $(call move-if-changed,$@.tmp2,$@)
 
 arm64.h: mkheader.py structs.py $(ROOT)/arch-arm.h $(ROOT)/xen.h
-       $(PYTHON) $< $* $@ $(filter %.h,$^)
+       $(PYTHON) $< $* $@.tmp $(filter %.h,$^)
+       #Avoid mixing an alignment directive with a uint64_t cast or sizeof 
expression
+       sed 's/(__align8__ \(uint64_t\))/(\1)/g' < $@.tmp > $@.tmp2
+       rm $@.tmp
+       $(call move-if-changed,$@.tmp2,$@)
 
 x86_32.h: mkheader.py structs.py $(ROOT)/arch-x86/xen-x86_32.h 
$(ROOT)/arch-x86/xen.h $(ROOT)/xen.h
-       $(PYTHON) $< $* $@ $(filter %.h,$^)
+       $(PYTHON) $< $* $@.tmp $(filter %.h,$^)
+       #Avoid mixing an alignment directive with a uint64_t cast or sizeof 
expression
+       sed 's/(__align8__ \(uint64_t\))/(\1)/g' < $@.tmp > $@.tmp2
+       rm $@.tmp
+       $(call move-if-changed,$@.tmp2,$@)
 
 x86_64.h: mkheader.py structs.py $(ROOT)/arch-x86/xen-x86_64.h 
$(ROOT)/arch-x86/xen.h $(ROOT)/xen.h
        $(PYTHON) $< $* $@.tmp $(filter %.h,$^)
        #Avoid mixing an alignment directive with a uint64_t cast or sizeof 
expression
-       sed 's/(__align8__ \(u\?int64_t\))/(\1)/g' < $@.tmp > $@.tmp2
+       sed 's/(__align8__ \(uint64_t\))/(\1)/g' < $@.tmp > $@.tmp2
        rm $@.tmp
        $(call move-if-changed,$@.tmp2,$@)
 
-- 
2.6.4 (Apple Git-63)


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel