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

[Dmitry Safonov]

With `-r` option relocation to parasite_service
was not made on ARM:
0x76dbc018:	bl	0x76dbc018		0xebfffffe
(You may saw it with objdump also).

This leaded to hang at "Putting tsock" message:
(01.368297) ----------------------------------------
(01.368321)
(01.368339) Collecting fds (pid: 13503)
(01.368360) ----------------------------------------
(01.368535) Found 3 file descriptors
(01.368564) ----------------------------------------
(01.368648) Dump private signals of 13503
(01.368708) Dump shared signals of 13503
(01.368761) Parasite syscall_ip at 0x10000
(01.369605) Set up parasite blob using memfd
(01.369641) Putting parasite blob into 0x76cc5000->0x76e1f000
(01.369755) Dumping GP/FPU registers for 13503
(01.369818) Putting tsock into pid 13503

Link against native.lib.a which also fixes build for aarm64.

Reported-by: alex vk <avankemp at gmail.com>
Reported-by: long.wanglong <long.wanglong at huawei.com>
Cc: Cyrill Gorcunov <gorcunov at gmail.com>
Cc: Christopher Covington <cov at codeaurora.org>
Reviewed-by: Christopher Covington <cov at codeaurora.org>
Signed-off-by: Dmitry Safonov <dsafonov at virtuozzo.com>
---
v3: check aarch64 in ARCH instead of arm64
v2: drop partial linking only for arm/arm64

 criu/pie/Makefile | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/criu/pie/Makefile b/criu/pie/Makefile
index 3679e24438a4..a32047b973b9 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 aarch64,$(ARCH)),)
+        LD_R := -r
+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
 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, $@)
-- 
2.8.0