[CRIU] [PATCHv2 05/12] arm: Build {pie-, }util-vdso with CONFIG_VDSO_32
Dmitry Safonov
dima at arista.com
Wed May 29 19:15:08 MSK 2019
From: Dmitry Safonov <0x7f454c46 at gmail.com>
Signed-off-by: Dmitry Safonov <0x7f454c46 at gmail.com>
---
Makefile | 2 +-
criu/Makefile.crtools | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index cee8a42c9b76..475d4abaffdf 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 d24bb174cfb7..23dd6d664f5d 100644
--- a/criu/Makefile.crtools
+++ b/criu/Makefile.crtools
@@ -90,7 +90,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)
--
2.21.0
More information about the CRIU
mailing list