x86/pie: split parasite-head.S on {-32,-64} parts

Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com>
Acked-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

criu/arch/x86/parasite-head.S → criu/arch/x86/parasite-head-32.S

@@ -3,23 +3,9 @@
 
 	.section .head.text, "ax"
 
-#ifdef CONFIG_X86_64
-
-ENTRY(__export_parasite_head_start)
-	subq	$16, %rsp
-	andq	$~15, %rsp
-	pushq	$0
-	movq	%rsp, %rbp
-	movl	__export_parasite_cmd(%rip), %edi
-	leaq	__export_parasite_args(%rip), %rsi
-	call	parasite_service
-	int	$0x03
-	.align 8
-__export_parasite_cmd:
-	.long 0
-END(__export_parasite_head_start)
-
-#else /* CONFIG_X86_64 */
+#ifndef CONFIG_X86_32
+# error 32-bit parasite should compile with CONFIG_X86_32
+#endif
 
 ENTRY(__export_parasite_head_start)
 	subl	$16, %esp
@@ -36,5 +22,3 @@ ENTRY(__export_parasite_head_start)
 GLOBAL(__export_parasite_cmd)
 	.long 0
 END(__export_parasite_head_start)
-
-#endif /* CONFIG_X86_64 */

criu/arch/x86/parasite-head-64.S

+#include "asm/linkage.h"
+#include "parasite.h"
+
+	.section .head.text, "ax"
+
+#ifndef CONFIG_X86_64
+# error 64-bit parasite should compile with CONFIG_X86_64
+#endif
+
+ENTRY(__export_parasite_head_start)
+	subq	$16, %rsp
+	andq	$~15, %rsp
+	pushq	$0
+	movq	%rsp, %rbp
+	movl	__export_parasite_cmd(%rip), %edi
+	leaq	__export_parasite_args(%rip), %rsi
+	call	parasite_service
+	int	$0x03
+	.align 8
+__export_parasite_cmd:
+	.long 0
+END(__export_parasite_head_start)

criu/pie/Makefile

@@ -2,16 +2,17 @@ target			+= parasite
 target			+= restorer
 
 parasite-obj-y		+= parasite.o
-parasite-obj-y		+= ./$(ARCH_DIR)/parasite-head.o
 
 restorer-obj-y		+= restorer.o
 restorer-obj-y		+= ./$(ARCH_DIR)/restorer.o
 
 ifeq ($(ARCH),x86)
 # FIXME: depend on 32/64 pie type
+parasite-obj-y		+= ./$(ARCH_DIR)/parasite-head-64.o
 parasite-obj-e		+= ./$(ARCH_DIR)/syscalls-64.built-in.o
 restorer-obj-e		+= ./$(ARCH_DIR)/syscalls-64.built-in.o
 else
+parasite-obj-y		+= ./$(ARCH_DIR)/parasite-head.o
 parasite-obj-e		+= ./$(ARCH_DIR)/syscalls.built-in.o
 restorer-obj-e		+= ./$(ARCH_DIR)/syscalls.built-in.o
 endif