mirror of
https://github.com/checkpoint-restore/criu.git
synced 2026-01-23 02:14:37 +00:00
9d6228630b
I am not quite sure how that happened, but compel hgen was not used for ARM/ARM64, instead there's a simple version of it, called gen-offsets.sh. The main difference is, shell script doesn't handle ELF relocations, which apparently is not (currently?) needed for ARM. It's bad to maintain two tools for the same functionality, so this patch kills gen-offsets.sh and related stuff, making compel hgen working on ARM. ELF relocations are still not handled, this code is #ifdef-ed out for now and can be fixed to work on ARM later. This patch also kills some macros and defines that seem obsoleted now. For example, compel_relocs_apply() is now called unconditionally, as it handles the trivial case of 0 relocs just fine. Now, I checked that the blob headers generated by compel hgen and gen-offsets.h are similar (i.e. generated blob code and values defined are the same), but haven't done much above that. Signed-off-by: Kir Kolyshkin <kir@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com> Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
61 lines
1.7 KiB
Text
61 lines
1.7 KiB
Text
include $(__nmk_dir)utils.mk
|
|
include $(__nmk_dir)msg.mk
|
|
include $(SRC_DIR)/scripts/feature-tests.mak
|
|
|
|
ifeq ($(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),true)
|
|
LIBS_FEATURES += -lbsd
|
|
FEATURE_DEFINES += -DCONFIG_HAS_LIBBSD
|
|
endif
|
|
|
|
ifeq ($(call pkg-config-check,libselinux),y)
|
|
LIBS_FEATURES += -lselinux
|
|
FEATURE_DEFINES += -DCONFIG_HAS_SELINUX
|
|
endif
|
|
|
|
export LIBS += $(LIBS_FEATURES)
|
|
|
|
CONFIG_FILE = $(SRC_DIR)/.config
|
|
|
|
$(CONFIG_FILE):
|
|
touch $(CONFIG_FILE)
|
|
|
|
#
|
|
# FIXME Bring back once libcompel complete
|
|
#ifeq ($(SRCARCH),x86)
|
|
## CONFIG_COMPAT is only for x86 now, no need for compile-test other archs
|
|
#ifeq ($(call try-cc,$(FEATURE_TEST_X86_COMPAT),-m32),true)
|
|
# export CONFIG_COMPAT := y
|
|
# FEATURE_DEFINES += -DCONFIG_COMPAT
|
|
#endif
|
|
#endif
|
|
|
|
export DEFINES += $(FEATURE_DEFINES)
|
|
export CFLAGS += $(FEATURE_DEFINES)
|
|
|
|
FEATURES_LIST := TCP_REPAIR STRLCPY STRLCAT PTRACE_PEEKSIGINFO \
|
|
SETPROCTITLE_INIT MEMFD TCP_REPAIR_WINDOW
|
|
|
|
# $1 - config name
|
|
define gen-feature-test
|
|
ifeq ($$(call try-cc,$$(FEATURE_TEST_$(1)),$$(LIBS_FEATURES),$$(DEFINES)),true)
|
|
$(Q) @echo '#define CONFIG_HAS_$(1)' >> $$@
|
|
$(Q) @echo '' >> $$@
|
|
endif
|
|
endef
|
|
|
|
define config-header-rule
|
|
$(CONFIG_HEADER): $(SRC_DIR)/scripts/feature-tests.mak $(CONFIG_FILE)
|
|
$$(call msg-gen, $$@)
|
|
$(Q) @echo '#ifndef __CR_CONFIG_H__' > $$@
|
|
$(Q) @echo '#define __CR_CONFIG_H__' >> $$@
|
|
$(Q) @echo '' >> $$@
|
|
$(call map,gen-feature-test,$(FEATURES_LIST))
|
|
$(Q) @cat $(CONFIG_FILE) | sed -n -e '/^[^#]/s/^/#define CONFIG_/p' >> $$@
|
|
ifeq ($$(VDSO),y)
|
|
$(Q) @echo '#define CONFIG_VDSO' >> $$@
|
|
$(Q) @echo '' >> $$@
|
|
endif
|
|
$(Q) @echo '#endif /* __CR_CONFIG_H__ */' >> $$@
|
|
endef
|
|
|
|
$(eval $(config-header-rule))
|