criu/pie/vdso: change CONFIG_{X86_32 => VDSO_32}

It's needed for ELF magic, not for platform.
Will help to simplify Makefile.library (the very next patch).

travis-ci: success for Rectify 32-bit compatible C/R on x86
Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

criu/include/util-vdso.h

@@ -49,7 +49,7 @@ struct vdso_symtable {
 			},						\
 	}
 
-#ifdef CONFIG_X86_32
+#if defined(CONFIG_X86_32) || defined(CONFIG_VDSO_32)
 
 #define Ehdr_t		Elf32_Ehdr
 #define Sym_t		Elf32_Sym
@@ -88,7 +88,7 @@ static inline unsigned long vvar_vma_size(struct vdso_symtable *t)
 	return t->vvar_end - t->vvar_start;
 }
 
-#if defined(CONFIG_X86_32)
+#if defined(CONFIG_VDSO_32)
 # define vdso_fill_symtable vdso_fill_symtable_compat
 #endif
 

criu/pie/Makefile.library

@@ -13,7 +13,7 @@ ifeq ($(ARCH),x86)
         endif
         CFLAGS_native	+= -DCONFIG_X86_64
         CFLAGS_compat	+= -fno-pic -m32 -DCONFIG_X86_32
-        CFLAGS_util-vdso-elf32.o	+= -DCONFIG_X86_32
+        CFLAGS_util-vdso-elf32.o	+= -DCONFIG_VDSO_32
         OBJS		+= ./$(ARCH_DIR)/memcpy.o
 endif
 

criu/pie/util-vdso.c

@@ -74,7 +74,7 @@ static int has_elf_identity(Ehdr_t *ehdr)
 	/*
 	 * See Elf specification for this magic values.
 	 */
-#if defined(CONFIG_X86_32)
+#if defined(CONFIG_VDSO_32)
 	static const char elf_ident[] = {
 		0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x00,
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,