[CRIU] [PATCH 04/20] criu/pie: rename native.lib.a into pie.lib.a

[Dmitry Safonov]

As we have only one pie lib - no need to name it {native,compat}.
The next patch cleans Makefile.

Signed-off-by: Dmitry Safonov <dsafonov at virtuozzo.com>
---
 criu/Makefile             |  6 +++---
 criu/pie/Makefile         | 16 ++++++++--------
 criu/pie/Makefile.library | 16 ++++++++--------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/criu/Makefile b/criu/Makefile
index 3f79b6c99abc..af8433e46728 100644
--- a/criu/Makefile
+++ b/criu/Makefile
@@ -42,12 +42,12 @@ $(ARCH-LIB):
 
 #
 # PIE library code.
-criu/pie/native.lib.a: $(ARCH-LIB)
+criu/pie/pie.lib.a: $(ARCH-LIB)
 	$(Q) $(MAKE) $(call build-as,Makefile.library,criu/pie) all
 
 #
 # PIE code blobs themseves.
-pie: criu/pie/native.lib.a compel/plugins/std.built-in.o
+pie: criu/pie/pie.lib.a compel/plugins/std.built-in.o
 	$(Q) $(MAKE) $(build)=criu/pie all
 .PHONY: pie
 
@@ -56,7 +56,7 @@ criu/pie/%: pie
 
 #
 # CRIU executable
-PROGRAM-BUILTINS	+= criu/pie/native.lib.a
+PROGRAM-BUILTINS	+= criu/pie/pie.lib.a
 PROGRAM-BUILTINS	+= images/built-in.o
 PROGRAM-BUILTINS	+= $(obj)/built-in.o
 PROGRAM-BUILTINS	+= $(ARCH-LIB)
diff --git a/criu/pie/Makefile b/criu/pie/Makefile
index 5d0b43db113f..9b14916c1290 100644
--- a/criu/pie/Makefile
+++ b/criu/pie/Makefile
@@ -106,17 +106,17 @@ endif
 
 $(obj)/restorer.built-in.o: $(compel_std-native)
 $(obj)/restorer.built-in.bin.o: $(obj)/restorer.built-in.o		\
-				$(obj)/native.lib.a $(compel_pack_lds-native)
+				$(obj)/pie.lib.a $(compel_pack_lds-native)
 	$(call msg-gen, $@)
-	$(Q) $(LD) -r -T $(compel_pack_lds-native) -o $@ $< $(obj)/native.lib.a
+	$(Q) $(LD) -r -T $(compel_pack_lds-native) -o $@ $< $(obj)/pie.lib.a
 
 # $1 - binary mode: native/compat
 define gen-rule-built-in.bin.o
 $(obj)/$(1).built-in.o: $(compel_std-$(1))
 $(obj)/parasite-$(1).built-in.bin.o: $(obj)/$(1).built-in.o		\
-				$(obj)/$(1).lib.a $(compel_pack_lds-$(1))
+				$(obj)/pie.lib.a $(compel_pack_lds-$(1))
 	$$(call msg-gen, $$@)
-	$(Q) $(LD) -r -T $(compel_pack_lds-$(1)) -o $$@ $$< $(obj)/$(1).lib.a
+	$(Q) $(LD) -r -T $(compel_pack_lds-$(1)) -o $$@ $$< $(obj)/pie.lib.a
 endef
 $(eval $(call map,gen-rule-built-in.bin.o,$(parasite_target)))
 
@@ -141,18 +141,18 @@ endif
 define gen-rule-built-in.bin.o
 $(obj)/$(1).built-in.o: $(compel_std-$(1))
 $(obj)/parasite-$(1).built-in.bin.o: $(obj)/$(1).built-in.o		\
-				$(compel_pack_lds-$(1)) $(obj)/native.lib.a
+				$(compel_pack_lds-$(1)) $(obj)/pie.lib.a
 	$$(call msg-gen, $$@)
-	$(Q) $(LD) $(LD_R) -T $(compel_pack_lds-$(1)) -o $$@ $$< $(obj)/native.lib.a
+	$(Q) $(LD) $(LD_R) -T $(compel_pack_lds-$(1)) -o $$@ $$< $(obj)/pie.lib.a
 endef
 
 $(eval $(call map,gen-rule-built-in.bin.o,$(parasite_target)))
 
 $(obj)/restorer.built-in.o: $(compel_std-native)
 $(obj)/restorer.built-in.bin.o: $(obj)/restorer.built-in.o		\
-				$(compel_pack_lds-native) $(obj)/native.lib.a
+				$(compel_pack_lds-native) $(obj)/pie.lib.a
 	$(call msg-gen, $@)
-	$(Q) $(LD) $(LD_R) -T $(compel_pack_lds-native) -o $@ $< $(obj)/native.lib.a
+	$(Q) $(LD) $(LD_R) -T $(compel_pack_lds-native) -o $@ $< $(obj)/pie.lib.a
 
 $(obj)/%.built-in.bin: $(obj)/%.built-in.bin.o
 	$(call msg-gen, $@)
diff --git a/criu/pie/Makefile.library b/criu/pie/Makefile.library
index c011508c5a57..43da82929076 100644
--- a/criu/pie/Makefile.library
+++ b/criu/pie/Makefile.library
@@ -1,17 +1,17 @@
-target			:= native
+target			:= pie
 
 CFLAGS			:= $(filter-out -DCONFIG_X86_64,$(CFLAGS))
 CFLAGS			+= -fno-stack-protector -DCR_NOGLIBC
 LDFLAGS			+= -z noexecstack
 
-CFLAGS_native		+= -fpie
+CFLAGS_pie		+= -fpie
 
 ifeq ($(ARCH),x86)
         ifeq ($(CONFIG_COMPAT),y)
                 target	+= compat
-                native-lib-y	+= util-vdso-elf32.o
+                pie-lib-y	+= util-vdso-elf32.o
         endif
-        CFLAGS_native	+= -DCONFIG_X86_64
+        CFLAGS_pie	+= -DCONFIG_X86_64
         CFLAGS_compat	+= -fno-pic -m32 -DCONFIG_X86_32
         CFLAGS_util-vdso-elf32.o	+= -DCONFIG_VDSO_32
         OBJS		+= ./$(ARCH_DIR)/memcpy.o
@@ -36,9 +36,9 @@ ifeq ($(SRCARCH),ppc64)
 			   ./$(ARCH_DIR)/memcmp_64.o ./$(ARCH_DIR)/misc.o
 endif
 
-define gen-native-objs
-native-lib-y		+= $(1)
-CFLAGS_$(1)		:= $(CFLAGS_native)
+define gen-pie-objs
+pie-lib-y		+= $(1)
+CFLAGS_$(1)		:= $(CFLAGS_pie)
 endef
 
 compat-obj		= $(basename $(notdir $(1)))-compat.o
@@ -47,7 +47,7 @@ compat-lib-y		+= $(dir ./$(call objectify,$(1)))compat/$(compat-obj)
 CFLAGS_$(compat-obj)	:= $(CFLAGS_compat)
 endef
 
-$(eval $(call map,gen-native-objs,$(OBJS)))
+$(eval $(call map,gen-pie-objs,$(OBJS)))
 $(eval $(call map,gen-compat-objs,$(OBJS)))
 
 #
-- 
2.10.2