mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 22:35:33 +00:00
Code Issues Releases Wiki Activity

UFFD related makefiles cleanup

Browse Source 
Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
Mike Rapoport
2016-04-18 16:34:32 +03:00
committed by Andrei Vagin
parent 7c78a48b06
commit 10ef427623
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.config
View File

@@ -35,12 +35,8 @@ endif
export DEFINES += $(FEATURE_DEFINES) export DEFINES += $(FEATURE_DEFINES)
export CFLAGS += $(FEATURE_DEFINES) export CFLAGS += $(FEATURE_DEFINES)
ifeq ($(call try-cc,$(FEATURE_TEST_UFFD)),y)
export UFFD := 1
endif
FEATURES_LIST := TCP_REPAIR STRLCPY STRLCAT PTRACE_PEEKSIGINFO \ FEATURES_LIST := TCP_REPAIR STRLCPY STRLCAT PTRACE_PEEKSIGINFO \
SETPROCTITLE_INIT MEMFD TCP_REPAIR_WINDOW SETPROCTITLE_INIT MEMFD TCP_REPAIR_WINDOW UFFD
# $1 - config name # $1 - config name
define gen-feature-test define gen-feature-test
@@ -61,10 +57,6 @@ $(call map,gen-feature-test,$(FEATURES_LIST))
ifeq ($$(VDSO),y) ifeq ($$(VDSO),y)
$(Q) @echo '#define CONFIG_VDSO' >> $$@ $(Q) @echo '#define CONFIG_VDSO' >> $$@
$(Q) @echo '' >> $$@ $(Q) @echo '' >> $$@
endif
ifeq ($$(UFFD),1)
$(Q) @echo '#define CONFIG_HAS_UFFD' >> $$@
$(Q) @echo '' >> $$@
endif endif
$(Q) @echo '#endif /* __CR_CONFIG_H__ */' >> $$@ $(Q) @echo '#endif /* __CR_CONFIG_H__ */' >> $$@
endef endef

3
criu/Makefile.crtools
View File

@@ -82,6 +82,7 @@ obj-y += uts_ns.o
obj-y += path.o obj-y += path.o
obj-y += autofs.o obj-y += autofs.o
obj-y += fdstore.o obj-y += fdstore.o
obj-y += uffd.o
ifeq ($(VDSO),y) ifeq ($(VDSO),y)
obj-y += pie-util-vdso.o obj-y += pie-util-vdso.o
@@ -92,8 +93,6 @@ obj-$(CONFIG_COMPAT) += vdso-compat.o
CFLAGS_REMOVE_vdso-compat.o += $(CFLAGS-ASAN) $(CFLAGS-GCOV) CFLAGS_REMOVE_vdso-compat.o += $(CFLAGS-ASAN) $(CFLAGS-GCOV)
endif endif
obj-y += uffd.o
PROTOBUF_GEN := scripts/protobuf-gen.sh PROTOBUF_GEN := scripts/protobuf-gen.sh
$(obj)/protobuf-desc.d: $(obj)/protobuf-desc-gen.h $(obj)/protobuf-desc.d: $(obj)/protobuf-desc-gen.h