[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen master] fix sed usage in build rules



commit 3be448811f3702a5b52a21d0a55683c018122759
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Tue Apr 1 18:21:43 2014 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Apr 1 18:21:43 2014 +0200

    fix sed usage in build rules
    
    Apparently FreeBSD sed is more picky than GNU sed, wanting a semicolon
    at the end of a brace enclosed statement list.
    
    Reported-by: Roger Pau Monné<roger.pau@xxxxxxxxxx>
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Keir Fraser <keir@xxxxxxx>
---
 xen/Rules.mk                 |    2 +-
 xen/arch/x86/boot/build32.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 42c713f..b0d4634 100644
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -170,7 +170,7 @@ SPECIAL_DATA_SECTIONS := rodata $(foreach n,1 2 4 
8,rodata.str1.$(n)) \
                         $(foreach r,rel rel.ro,data.$(r) data.$(r).local)
 
 $(filter %.init.o,$(obj-y) $(obj-bin-y) $(extra-y)): %.init.o: %.o Makefile
-       $(OBJDUMP) -h $< | sed -n '/[0-9]/{s,00*,0,g;p}' | while read idx name 
sz rest; do \
+       $(OBJDUMP) -h $< | sed -n '/[0-9]/{s,00*,0,g;p;}' | while read idx name 
sz rest; do \
                case "$$name" in \
                .text|.text.*|.data|.data.*|.bss) \
                        test $$sz != 0 || continue; \
diff --git a/xen/arch/x86/boot/build32.mk b/xen/arch/x86/boot/build32.mk
index a2d4b34..a36f620 100644
--- a/xen/arch/x86/boot/build32.mk
+++ b/xen/arch/x86/boot/build32.mk
@@ -20,7 +20,7 @@ CFLAGS := $(filter-out -flto,$(CFLAGS))
 
 %.o: %.c
        $(CC) $(CFLAGS) -c -fpic $< -o $@
-       $(OBJDUMP) -h $@ | sed -n '/[0-9]/{s,00*,0,g;p}' |\
+       $(OBJDUMP) -h $@ | sed -n '/[0-9]/{s,00*,0,g;p;}' |\
                while read idx name sz rest; do \
                        case "$$name" in \
                        .data|.data.*|.rodata|.rodata.*|.bss|.bss.*) \
--
generated by git-patchbot for /home/xen/git/xen.git#master

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

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.