mirror of
https://github.com/checkpoint-restore/criu.git
synced 2026-07-18 00:58:31 +00:00
61e6c01d09
We currently define "CFLAGS += -msoft-float -fno-optimize-sibling-calls" in Makefile.compel. Makefile.compel is included into the toplevel Makefile and so changes CFLAGS which are exported to all criu and zdtm Makefiles. We must not use -msoft-float outside the compel files. E.g. otherwise for zdtm we get the following build error: uptime_grow.o: In function `main': /tmp/2/criu/test/zdtm/static/uptime_grow.c:36: undefined reference to `__floatdidf' /tmp/2/criu/test/zdtm/static/uptime_grow.c:36: undefined reference to `__muldf3' /tmp/2/criu/test/zdtm/static/uptime_grow.c:36: undefined reference to `__floatdidf' /tmp/2/criu/test/zdtm/static/uptime_grow.c:36: undefined reference to `__adddf3 Fix this and move the CFLAGS definition to the compel Makefiles. We do this by defining a new flag CFLAGS_PIE that is only used for pie code. Reported-by: Adrian Reber <areber@redhat.com> Suggested-by: Dmitry Safonov <dsafonov@virtuozzo.com> Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com> Reviewed-by: Dmitry Safonov <dsafonov@virtuozzo.com> Tested-by: Adrian Reber <areber@redhat.com> Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
72 lines
2.6 KiB
Text
72 lines
2.6 KiB
Text
COMPEL_BIN := ./compel/compel-host
|
|
export COMPEL_BIN
|
|
|
|
COMPEL_VERSION_HEADER := compel/include/version.h
|
|
|
|
$(COMPEL_VERSION_HEADER): Makefile.versions
|
|
$(call msg-gen, $(COMPEL_VERSION_HEADER))
|
|
$(Q) echo "/* Autogenerated, do not edit */" > $(COMPEL_VERSION_HEADER)
|
|
$(Q) echo "#ifndef COMPEL_SO_VERSION_H__" >> $(COMPEL_VERSION_HEADER)
|
|
$(Q) echo "#define COMPEL_SO_VERSION_H__" >> $(COMPEL_VERSION_HEADER)
|
|
$(Q) echo "#define COMPEL_SO_VERSION \"$(COMPEL_SO_VERSION)\"" >> $(COMPEL_VERSION_HEADER)
|
|
$(Q) echo "#define COMPEL_SO_VERSION_MAJOR " $(COMPEL_SO_VERSION_MAJOR) >> $(COMPEL_VERSION_HEADER)
|
|
$(Q) echo "#define COMPEL_SO_VERSION_MINOR " $(COMPEL_SO_VERSION_MINOR) >> $(COMPEL_VERSION_HEADER)
|
|
$(Q) echo "#define COMPEL_SO_VERSION_SUBLEVEL " $(COMPEL_SO_VERSION_SUBLEVEL) >> $(COMPEL_VERSION_HEADER)
|
|
$(Q) echo "#endif /* COMPEL_SO_VERSION_H__ */" >> $(COMPEL_VERSION_HEADER)
|
|
|
|
compel/include/asm:
|
|
$(call msg-gen, $@)
|
|
$(Q) ln -s ../arch/$(ARCH)/src/lib/include $@
|
|
|
|
compel-deps += compel/include/asm
|
|
compel-deps += $(COMPEL_VERSION_HEADER)
|
|
compel-deps += $(CONFIG_HEADER)
|
|
compel-deps += include/common/asm
|
|
compel-plugins += compel/plugins/std.lib.a compel/plugins/fds.lib.a
|
|
|
|
LIBCOMPEL_SO := libcompel.so
|
|
LIBCOMPEL_A := libcompel.a
|
|
export LIBCOMPEL_SO LIBCOMPEL_A
|
|
criu-deps += compel/$(LIBCOMPEL_A)
|
|
|
|
#
|
|
# Compel itself.
|
|
compel/Makefile: ;
|
|
compel/%: $(compel-deps) $(compel-plugins) .FORCE
|
|
$(Q) $(MAKE) $(build)=compel $@
|
|
|
|
criu-deps += compel/compel-host-bin
|
|
|
|
#
|
|
# Plugins
|
|
compel/plugins/Makefile: ;
|
|
compel/plugins/%: $(compel-deps) .FORCE
|
|
$(Q) $(MAKE) $(build)=compel/plugins $@
|
|
|
|
#
|
|
# GNU make 4.x supports targets matching via wide
|
|
# match targeting, where GNU make 3.x series (used on
|
|
# Travis) is not, so we have to write them here explicitly.
|
|
compel/plugins/std.lib.a: $(compel-deps) .FORCE
|
|
$(Q) $(MAKE) $(build)=compel/plugins $@
|
|
|
|
compel/plugins/shmem.lib.a: $(compel-deps) compel/plugins/std.lib.a .FORCE
|
|
$(Q) $(MAKE) $(build)=compel/plugins $@
|
|
|
|
compel/plugins/fds.lib.a: $(compel-deps) compel/plugins/std.lib.a .FORCE
|
|
$(Q) $(MAKE) $(build)=compel/plugins $@
|
|
|
|
compel/compel: compel/built-in.o compel/$(LIBCOMPEL_A) | $(compel-deps)
|
|
$(call msg-link, $@)
|
|
$(Q) $(CC) $(CFLAGS) $^ $(WRAPFLAGS) $(LDFLAGS) -rdynamic -o $@
|
|
|
|
#
|
|
# And compel library.
|
|
LIBCOMPEL_SO_CFLAGS += $(CFLAGS) -rdynamic -Wl,-soname,$(LIBCOMPEL_SO).$(COMPEL_SO_VERSION_MAJOR)
|
|
compel/$(LIBCOMPEL_SO): compel/$(LIBCOMPEL_A)
|
|
$(call msg-link, $@)
|
|
$(Q) $(CC) -shared $(LIBCOMPEL_SO_CFLAGS) -o $@ -Wl,--whole-archive $^ -Wl,--no-whole-archive $(LDFLAGS)
|
|
|
|
compel-install-targets += compel/$(LIBCOMPEL_SO)
|
|
compel-install-targets += compel/compel
|
|
compel-install-targets += $(compel-plugins)
|