compel: criu -- Use compel-host program

compel-host is needed to build criu itself and
run during piegen blob generation.
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

Makefile

@@ -226,9 +226,9 @@ $(SOCCR_A): |soccr/built-in.o
 #
 # But note that we're already included
 # the nmk so we can reuse it there.
-criu/%: images/built-in.o compel/compel $(VERSION_HEADER) $(CONFIG_HEADER) .FORCE
+criu/%: images/built-in.o compel/compel-host $(VERSION_HEADER) $(CONFIG_HEADER) .FORCE
 	$(Q) $(MAKE) $(build)=criu $@
-criu: images/built-in.o compel/compel $(SOCCR_A) $(VERSION_HEADER) $(CONFIG_HEADER)
+criu: images/built-in.o compel/compel-host $(SOCCR_A) $(VERSION_HEADER) $(CONFIG_HEADER)
 	$(Q) $(MAKE) $(build)=criu all
 .PHONY: criu
 

criu/pie/Makefile

@@ -57,9 +57,9 @@ CFLAGS			+= -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=0
 
 ccflags-y		+= -DCR_NOGLIBC
 ifneq ($(filter-out clean mrproper,$(MAKECMDGOALS)),)
-NATIVE_CFLAGS		:= $(shell $(SRC_DIR)/compel/compel --arch=$(ARCH) cflags)
+NATIVE_CFLAGS		:= $(shell $(SRC_DIR)/compel/compel-host --arch=$(ARCH) cflags)
 ifeq ($(ARCH),x86)
-        COMPAT_CFLAGS	:= $(shell $(SRC_DIR)/compel/compel --arch=ia32 cflags)
+        COMPAT_CFLAGS	:= $(shell $(SRC_DIR)/compel/compel-host --arch=ia32 cflags)
 endif
 endif
 
@@ -157,9 +157,9 @@ $(obj)/parasite-$(1).built-in.bin.o: $(obj)/$(1).built-in.o		\
 endef
 $(eval $(call map,gen-rule-built-in.bin.o,$(parasite_target)))
 
-$(obj)/%-blob.h: $(obj)/%.built-in.bin.o $(SRC_DIR)/compel/compel
+$(obj)/%-blob.h: $(obj)/%.built-in.bin.o $(SRC_DIR)/compel/compel-host
 	$(call msg-gen, $@)
-	$(Q) $(SRC_DIR)/compel/compel piegen -f $<			\
+	$(Q) $(SRC_DIR)/compel/compel-host piegen -f $<			\
 		-v $(call target-name,$@)_relocs			\
 		-p $(call target-name,$@)_blob_offset__			\
 		-s $(call target-name,$@)_blob				\