[Xen-changelog] [xen master] xen/tools: fix substitution of __align8__ uint64_t inside of headers

[patchbot@xxxxxxx]

commit daddec692ab36feff55d89d8e6e964503c226910
Author:     Roger Pau Monne <roger.pau@xxxxxxxxxx>
AuthorDate: Tue Apr 26 12:07:49 2016 +0200
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Wed Apr 27 14:12:36 2016 +0100

    xen/tools: fix substitution of __align8__ uint64_t inside of headers
    
    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>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Reviewed-by: Doug Goldstein <cardoe@xxxxxxxxxx>
    Release-acked-by: 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,$@)
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog