Commit 46661cf8 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Pavel Emelyanov

vdso: make -- Export VDSO and CONFIG_VDSO

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: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Acked-by: 's avatarAlexander Kartashov <alekskartashov@parallels.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent ff1cf6b2
...@@ -52,11 +52,13 @@ ARCH ?= $(shell uname -m | sed \ ...@@ -52,11 +52,13 @@ ARCH ?= $(shell uname -m | sed \
ifeq ($(ARCH),i386) ifeq ($(ARCH),i386)
SRCARCH := x86-32 SRCARCH := x86-32
DEFINES := -DCONFIG_X86_32 DEFINES := -DCONFIG_X86_32
VDSO := y
endif endif
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
SRCARCH := x86 SRCARCH := x86
DEFINES := -DCONFIG_X86_64 DEFINES := -DCONFIG_X86_64
LDARCH := i386:x86-64 LDARCH := i386:x86-64
VDSO := y
endif endif
ifeq ($(shell echo $(ARCH) | sed -e 's/arm.*/arm/'),arm) ifeq ($(shell echo $(ARCH) | sed -e 's/arm.*/arm/'),arm)
...@@ -123,6 +125,7 @@ export SRC_DIR SYSCALL-LIB SH RM ARCH_DIR OBJCOPY LDARCH LD ...@@ -123,6 +125,7 @@ export SRC_DIR SYSCALL-LIB SH RM ARCH_DIR OBJCOPY LDARCH LD
export USERCFLAGS export USERCFLAGS
export cflags-y export cflags-y
export VDSO_O export VDSO_O
export VDSO
include Makefile.inc include Makefile.inc
include Makefile.config include Makefile.config
......
...@@ -29,6 +29,9 @@ ifeq ($(call try-cc,$(STRLCAT_TEST),$(LIBS)),y) ...@@ -29,6 +29,9 @@ ifeq ($(call try-cc,$(STRLCAT_TEST),$(LIBS)),y)
endif endif
ifeq ($(call try-cc,$(PTRACE_PEEKSIGINFO_TEST),),y) ifeq ($(call try-cc,$(PTRACE_PEEKSIGINFO_TEST),),y)
$(Q) @echo '#define CONFIG_HAS_PEEKSIGINFO_ARGS' >> $@ $(Q) @echo '#define CONFIG_HAS_PEEKSIGINFO_ARGS' >> $@
endif
ifeq ($(VDSO),y)
$(Q) @echo '#define CONFIG_VDSO' >> $@
endif endif
$(Q) @echo '#endif /* __CR_CONFIG_H__ */' >> $@ $(Q) @echo '#endif /* __CR_CONFIG_H__ */' >> $@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment