[CRIU] Re: [PATCH 10/16] make: Squash parasite.lds.S and restorer.lds.S into pie.lds.S

[Pavel Emelyanov]

On 03/31/2012 02:46 AM, Cyrill Gorcunov wrote:
> 
> They are identical, no need to carry two copies.
> 
> Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
> ---
>  Makefile       |   12 ++++++------
>  parasite.lds.S |   18 ------------------
>  pie.lds.S      |   18 ++++++++++++++++++
>  restorer.lds.S |   18 ------------------
>  4 files changed, 24 insertions(+), 42 deletions(-)
>  delete mode 100644 parasite.lds.S
>  create mode 100644 pie.lds.S
>  delete mode 100644 restorer.lds.S
> 

> -$(HEAD-BIN): $(HEAD-LDS) $(OBJS-BLOB) parasite-util-net.o
> +$(HEAD-BIN): $(PIE-LDS) $(OBJS-BLOB) parasite-util-net.o
>  	$(E) "  GEN     " $@
> -	$(Q) $(LD) -T $^ -o $@
> +	$(Q) $(LD) -T pie.lds.S $(OBJS-BLOB) parasite-util-net.o -o $@

s/pie.lds.s/$(PIE-LDS)/

>  
>  $(HEAD-BLOB-GEN): $(HEAD-BIN) $(GEN-OFFSETS)
>  	$(E) "  GEN     " $@


> @@ -98,9 +98,9 @@ $(ROBJS): $(RSRCS-BLOB)
>  	$(E) "  CC      " $@
>  	$(Q) $(CC) -c $(CFLAGS) -fpic $(patsubst %.o,%.c,$@) -o $@
>  
> -$(RHEAD-BIN): $(ROBJS) $(RHEAD-LDS)
> +$(RHEAD-BIN): $(ROBJS) $(PIE-LDS)
>  	$(E) "  GEN     " $@
> -	$(Q) $(LD) -T $(patsubst %.bin,%.lds.S,$@) -o $@ $(ROBJS)
> +	$(Q) $(LD) -T pie.lds.S $(ROBJS) -o $@

Same here.

>  
>  $(RHEAD-BLOB-GEN): $(RHEAD-BIN) $(GEN-OFFSETS)
>  	$(E) "  GEN     " $@