[CRIU] [PATCHv2] arm/pie/build: do not produce relocatable parasite object

[Dmitry Safonov]

On 04/22/2016 09:20 PM, Christopher Covington wrote:
> On 04/22/2016 02:12 PM, Christopher Covington wrote:
>> Hi Dmitry,

Hello Christopher,

>> For what it's worth, I've done most of my AArch64 work on
>> qemu-system-aarch64. Example command line:
>>
>> qemu-system-aarch64 \
>> -nographic \
>> -monitor none \
>> -M virt \
>> -cpu cortex-a57 \
>> -m 4G \
>> -drive if=none,file=rootfs.img,cache=writeback,id=disk0 \
>> -device virtio-blk-device,drive=disk0 \
>> -serial stdio \
>> -kernel Image \
>> -append "root=/dev/vda rw console=ttyAMA0 maxcpus=1 norandmaps"
>> -fsdev local,id=r,security_model=none,path=/ \
>> -device virtio-9p-device,fsdev=r,mount_tag=passthrough \
>> -netdev user,id=mynet0,net=192.168.76.0/24,dhcpstart=192.168.76.9
>> -device virtio-net-device,netdev=mynet0

Thanks for the command, I'll give it a shot on monday.

>>>   criu/pie/Makefile | 13 +++++++++----
>>>   1 file changed, 9 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/criu/pie/Makefile b/criu/pie/Makefile
>>> index 3679e24438a4..4daf77338c85 100644
>>> --- a/criu/pie/Makefile
>>> +++ b/criu/pie/Makefile
>>> @@ -153,19 +153,24 @@ $(obj)/%-blob.h: $(obj)/%.built-in.bin.o $(SRC_DIR)/compel/compel
>>>   
>>>   else # !piegen-y
>>>   
>>> +# ld on arm doesn't like -pie and -r options together
>>> +ifeq ($(filter arm arm64,$(ARCH)),)
>>> +        LD_R := -r
>> I think this is conventionally named LDFLAGS.
> Although a user might expect to be able to set LDFLAGS on the command
> line. With that in mind, I think LD_R is fine. If you do want to go with
> LDFLAGS, consider using override (just for pie/Makefile, ideally letting
> the user play with LDFLAGS elsewhere).

I thought about using LDFLAGS here, but they already used to
link built-in.bin.o target object from sub-objects. So, I'm not
really sure, if we need here all LDFLAGS just to link against
pie.lds script. I'm not against, but.
Cyrill, what do you think?

>>> +endif
>>> +
>>>   define gen-rule-built-in.bin.o
>>>   $(obj)/parasite-$(1).built-in.bin.o: $(obj)/$(1).built-in.o		\
>>> -				$(obj)/pie.lds-$(1).S
>>> +				$(obj)/pie.lds-$(1).S $(obj)/native.lib.a
>>>   	$$(call msg-gen, $$@)
>>> -	$(Q) $(LD) -r -T $(obj)/pie.lds-$(1).S -o $$@ $$<
>>> +	$(Q) $(LD) $(LD_R) -T $(obj)/pie.lds-$(1).S -o $$@ $$< $(obj)/native.lib.a
>> Could you use "$$^" instead of "$$< $(obj)/native.lib.a"?

Thanks, will try, but I don't think that will work: that will cause
linking with pie.lds script, which should used with `-T'.
So, I think, ld will yell that we try to link to non-object file (script).

>>
>>>   endef
>>>   
>>>   $(eval $(call map,gen-rule-built-in.bin.o,$(parasite_target)))
>>>   
>>>   $(obj)/restorer.built-in.bin.o: $(obj)/restorer.built-in.o		\
>>> -				$(obj)/pie.lds-native.S
>>> +				$(obj)/pie.lds-native.S $(obj)/native.lib.a
>>>   	$(call msg-gen, $@)
>>> -	$(Q) $(LD) -r -T $(obj)/pie.lds-native.S -o $@ $<
>>> +	$(Q) $(LD) $(LD_R) -T $(obj)/pie.lds-native.S -o $@ $< $(obj)/native.lib.a
>>>   
>>>   $(obj)/%.built-in.bin: $(obj)/%.built-in.bin.o
>>>   	$(call msg-gen, $@)
>>>
>>>
>>>
>>>
>>>


-- 
Regards,
Dmitry Safonov