From a856c48e7756ba4f6f2cf5a2e14efadc413e3368 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <0x7f454c46@gmail.com>
Date: Wed, 29 May 2019 17:15:08 +0100
Subject: [PATCH] arm: Build {pie-, }util-vdso with CONFIG_VDSO_32

Signed-off-by: Dmitry Safonov <0x7f454c46@gmail.com>
---
 Makefile              | 2 +-
 criu/Makefile.crtools | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index cee8a42c9..475d4abaf 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ endif
 # Architecture specific options.
 ifeq ($(ARCH),arm)
         ARMV		:= $(shell echo $(UNAME-M) | sed -nr 's/armv([[:digit:]]).*/\1/p; t; i7')
-        DEFINES		:= -DCONFIG_ARMV$(ARMV)
+        DEFINES		:= -DCONFIG_ARMV$(ARMV) -DCONFIG_VDSO_32
 
         ifeq ($(ARMV),6)
                 USERCFLAGS += -march=armv6
diff --git a/criu/Makefile.crtools b/criu/Makefile.crtools
index 13ea22775..dd4dc3783 100644
--- a/criu/Makefile.crtools
+++ b/criu/Makefile.crtools
@@ -87,7 +87,7 @@ obj-y			+= servicefd.o
 ifeq ($(VDSO),y)
 obj-y			+= pie-util-vdso.o
 obj-y			+= vdso.o
-obj-y			+= pie-util-vdso-elf32.o
+obj-$(CONFIG_COMPAT)	+= pie-util-vdso-elf32.o
 CFLAGS_pie-util-vdso-elf32.o	+= -DCONFIG_VDSO_32
 obj-$(CONFIG_COMPAT)	+= vdso-compat.o
 CFLAGS_REMOVE_vdso-compat.o	+= $(CFLAGS-ASAN) $(CFLAGS-GCOV)