| Message ID | 1461682343-20597-7-git-send-email-roger.pau@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 26/04/16 15:52, Roger Pau Monne wrote: > 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@citrix.com> That is likely a side effect of me only getting the x86 bit of tools+clang working. Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
On 4/26/16 9:52 AM, Roger Pau Monne wrote: > 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@citrix.com> Reviewed-by: Doug Goldstein <cardoe@cardoe.com>
On Tue, Apr 26, 2016 at 04:52:15PM +0200, Roger Pau Monne wrote: > 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@citrix.com> > --- > Cc: Ian Jackson <ian.jackson@eu.citrix.com> > Cc: Wei Liu <wei.liu2@citrix.com> Acked-by: Wei Liu <wei.liu2@citrix.com>
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,$@)
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@citrix.com> --- Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> --- tools/include/xen-foreign/Makefile | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)