[CRIU] [PATCH 1/4] vdso: make -- Export VDSO and CONFIG_VDSO

Cyrill Gorcunov gorcunov at openvz.org
Mon May 26 00:50:12 PDT 2014


We will need it to figure out if architecture
needs vDSO handling code to be built. Note
currently only x86 is exporting vDSO simply
because ARM support is not yet ready.

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 Makefile        | 3 +++
 Makefile.config | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Makefile b/Makefile
index 4972f6ceb7a8..ba077e451552 100644
--- a/Makefile
+++ b/Makefile
@@ -52,11 +52,13 @@ ARCH ?= $(shell uname -m | sed		\
 ifeq ($(ARCH),i386)
 	SRCARCH      := x86-32
 	DEFINES      := -DCONFIG_X86_32
+	VDSO         := y
 endif
 ifeq ($(ARCH),x86_64)
 	SRCARCH      := x86
 	DEFINES      := -DCONFIG_X86_64
 	LDARCH       := i386:x86-64
+	VDSO         := y
 endif
 
 ifeq ($(shell echo $(ARCH) | sed -e 's/arm.*/arm/'),arm)
@@ -122,6 +124,7 @@ export CC MAKE CFLAGS LIBS SRCARCH DEFINES MAKEFLAGS CRIU-SO
 export SRC_DIR SYSCALL-LIB SH RM ARCH_DIR OBJCOPY LDARCH LD
 export cflags-y
 export VDSO_O
+export VDSO
 
 include Makefile.inc
 include Makefile.config
diff --git a/Makefile.config b/Makefile.config
index ca46ca14f63a..9f1857d60150 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -30,6 +30,9 @@ endif
 ifeq ($(call try-cc,$(PTRACE_PEEKSIGINFO_TEST),),y)
 	$(Q) @echo '#define CONFIG_HAS_PEEKSIGINFO_ARGS' >> $@
 endif
+ifeq ($(VDSO),y)
+	$(Q) @echo '#define CONFIG_VDSO' >> $@
+endif
 	$(Q) @echo '#endif /* __CR_CONFIG_H__ */' >> $@
 
 config: $(CONFIG)
-- 
1.9.3



More information about the CRIU mailing list