Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-01-23 02:14:37 +00:00
Code Issues Projects Releases Wiki Activity

compel: Include compel headers as system ones

Browse source 
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Cyrill Gorcunov 2016-10-27 19:01:21 +03:00 • committed by Andrei Vagin
parent a714fff5a3
commit a0810481e5
52 changed files with 101 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Makefile.compel
View file

@ -26,30 +26,38 @@ $(SRC_DIR)/compel/include/asm: $(SRC_DIR)/compel/arch/$(ARCH)/src/lib/include
$(Q) ln -s $^ $@
$(COMPEL_VERSION_HEADER): $(SRC_DIR)/compel/include/asm
compel-uapi-links += $(SRC_DIR)/compel/include/uapi/compel
compel-uapi-links += $(SRC_DIR)/compel/include/uapi/asm
compel-uapi-links += $(SRC_DIR)/compel/include/asm
compel-deps += $(compel-uapi-links)
compel-deps += $(COMPEL_VERSION_HEADER)
compel-deps += $(CONFIG_HEADER)
#
# Compel itself.
compel/%: $(COMPEL_VERSION_HEADER) $(CONFIG_HEADER) .FORCE
compel/%: $(compel-deps) .FORCE
$(Q) $(MAKE) $(build)=compel $@
#
# Plugins
compel/plugins/%: $(COMPEL_VERSION_HEADER) $(CONFIG_HEADER) .FORCE
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.built-in.o: $(COMPEL_VERSION_HEADER) .FORCE
compel/plugins/std.built-in.o: $(compel-deps) .FORCE
$(Q) $(MAKE) $(build)=compel/plugins $@
compel/plugins/shmem.built-in.o: $(COMPEL_VERSION_HEADER) .FORCE
compel/plugins/shmem.built-in.o: $(compel-deps) .FORCE
$(Q) $(MAKE) $(build)=compel/plugins $@
compel/plugins/fds.built-in.o: $(COMPEL_VERSION_HEADER) .FORCE
compel/plugins/fds.built-in.o: $(compel-deps) .FORCE
$(Q) $(MAKE) $(build)=compel/plugins $@
compel/compel: compel/built-in.o compel/lib.a $(COMPEL_VERSION_HEADER)
compel/compel: compel/built-in.o compel/lib.a | $(compel-deps)
$(call msg-link, $@)
$(Q) $(CC) $(CFLAGS) $^ $(WRAPFLAGS) $(LDFLAGS) -rdynamic -o $@

5
compel/Makefile
View file

@ -9,6 +9,11 @@ ccflags-y += -iquote compel/include
ccflags-y += -iquote compel/plugins/include
ccflags-y += -fPIC
#
# UAPI inclusion, referred as <compel/...>
ccflags-y += -I compel/include/uapi
ccflags-y += -I compel/plugins/include/uapi
lib-y += arch/$(ARCH)/src/lib/handle-elf.o
host-lib-y += arch/$(ARCH)/src/lib/handle-elf.o
lib-y += src/lib/handle-elf.o

16
compel/arch/arm/plugins/std/syscalls/gen-syscalls.pl
View file

@ -6,14 +6,14 @@ use warnings;
my $in = $ARGV[0];
my $codesout = $ARGV[1];
my $codes = $ARGV[1];
$codes =~ s/.*include\///g;
$codes =~ s/.*include\/uapi\//compel\/plugins\//g;
my $protosout = $ARGV[2];
my $protos = $ARGV[2];
$protos =~ s/.*include\///g;
$protos =~ s/.*include\/uapi\//compel\/plugins\//g;
my $asmout = $ARGV[3];
my $asmcommon = $ARGV[4];
my $prototypes = $ARGV[5];
$prototypes =~ s/.*include\///g;
$prototypes =~ s/.*include\/uapi\//compel\/plugins\//g;
my $bits = $ARGV[6];
my $codesdef = $codes;
@ -42,13 +42,13 @@ print PROTOSOUT <<"END";
/* Autogenerated, don't edit */
#ifndef $protosdef
#define $protosdef
#include "$prototypes"
#include "$codes"
#include <$prototypes>
#include <$codes>
END
print ASMOUT <<"END";
/* Autogenerated, don't edit */
#include "$codes"
#include <$codes>
#include "$asmcommon"
END
@ -91,8 +91,8 @@ for (<IN>) {
}
if ($need_aux == 1) {
print ASMOUT "#include \"uapi/std/syscall-aux.S\"\n";
print CODESOUT "#include \"uapi/std/syscall-aux.h\"\n";
print ASMOUT "#include <compel/plugins/std/syscall-aux.S>\n";
print CODESOUT "#include <compel/plugins/std/syscall-aux.h>\n";
}
print CODESOUT "#endif /* $codesdef */";

6
compel/arch/ppc64/plugins/std/syscalls/Makefile.syscalls
View file

@ -29,15 +29,15 @@ $(sys-proto): $(sys-def)
$(Q) echo "/* Autogenerated, don't edit */" > $@
$(Q) echo "#ifndef __ASM_CR_SYSCALL_PROTO_H__" >> $@
$(Q) echo "#define __ASM_CR_SYSCALL_PROTO_H__" >> $@
$(Q) echo "#include \"uapi/std/syscall-codes.h\"" >> $@
$(Q) echo "#include \"uapi/std/syscall-types.h\"" >> $@
$(Q) echo "#include <compel/plugins/std/syscall-codes.h>" >> $@
$(Q) echo "#include <compel/plugins/std/syscall-types.h>" >> $@
$(Q) cat $< | awk '/^__NR/{print "extern long", $$3, substr($$0, index($$0,$$4)), ";"}' >> $@
$(Q) echo "#endif /* __ASM_CR_SYSCALL_PROTO_H__ */" >> $@
$(sys-asm): $(sys-def) $(sys-asm-common) $(sys-codes) $(sys-proto)
$(E) " GEN " $@
$(Q) echo "/* Autogenerated, don't edit */" > $@
$(Q) echo "#include \"uapi/std/syscall-codes.h\"" >> $@
$(Q) echo "#include <compel/plugins/std/syscall-codes.h>" >> $@
$(Q) echo "#include \"$(sys-asm-common-name)\"" >> $@
$(Q) cat $< | awk '/^__NR/{print "SYSCALL(", $$3, ",", $$2, ")"}' >> $@

12
compel/arch/x86/plugins/std/syscalls/Makefile.syscalls
View file

@ -39,8 +39,8 @@ $(sys-proto): $(sys-def) $(sys-proto-types)
$(Q) echo "/* Autogenerated, don't edit */" > $$@
$(Q) echo "#ifndef ASM_SYSCALL_PROTO_H_$(1)__" >> $$@
$(Q) echo "#define ASM_SYSCALL_PROTO_H_$(1)__" >> $$@
$(Q) echo '#include "uapi/std/syscall-codes-$(1).h"' >> $$@
$(Q) echo '#include "uapi/std/syscall-types.h"' >> $$@
$(Q) echo '#include <compel/plugins/std/syscall-codes-$(1).h>' >> $$@
$(Q) echo '#include <compel/plugins/std/syscall-types.h>' >> $$@
ifeq ($(1),32)
$(Q) echo '#include "asm/syscall32.h"' >> $$@
endif
@ -53,7 +53,7 @@ define gen-rule-sys-asm
$(sys-asm): $(sys-def) $(sys-asm-common) $(sys-codes) $(sys-proto) $(sys-proto-types)
$(call msg-gen, $$@)
$(Q) echo "/* Autogenerated, don't edit */" > $$@
$(Q) echo '#include "uapi/std/syscall-codes-$(1).h"' >> $$@
$(Q) echo '#include <compel/plugins/std/syscall-codes-$(1).h>' >> $$@
$(Q) echo '#include "$(sys-asm-common-name)"' >> $$@
$(Q) cat $$< | awk '/^__NR/{print "SYSCALL(", $(AV)3, ",", $(AV)2, ")"}' >> $$@
endef
@ -71,7 +71,7 @@ $(sys-codes-generic): $(PLUGIN_ARCH_DIR)/std/syscalls/syscall_32.tbl $(sys-proto
$(Q) echo "/* Autogenerated, don't edit */" > $@
$(Q) echo "#ifndef __ASM_CR_SYSCALL_CODES_H__" >> $@
$(Q) echo "#define __ASM_CR_SYSCALL_CODES_H__" >> $@
$(Q) echo '#include "uapi/std/syscall-codes-64.h"' >> $@
$(Q) echo '#include <compel/plugins/std/syscall-codes-64.h>' >> $@
$(Q) cat $< | awk '/^__NR/{NR32=$$1; \
sub("^__NR", "__NR32", NR32); \
print "\n#ifndef ", NR32; \
@ -87,9 +87,9 @@ $(sys-proto-generic): $(strip $(call map,sys-proto,$(sys-bits))) $(sys-proto-typ
$(Q) echo "#define __ASM_CR_SYSCALL_PROTO_H__" >> $@
$(Q) echo "" >> $@
$(Q) echo "#ifdef CONFIG_X86_32" >> $@
$(Q) echo '#include "uapi/std/syscall-32.h"' >> $@
$(Q) echo '#include <compel/plugins/std/syscall-32.h>' >> $@
$(Q) echo "#else" >> $@
$(Q) echo '#include "uapi/std/syscall-64.h"' >> $@
$(Q) echo '#include <compel/plugins/std/syscall-64.h>' >> $@
$(Q) echo "#endif /* CONFIG_X86_32 */" >> $@
$(Q) echo "" >> $@
$(Q) echo "#endif /* __ASM_CR_SYSCALL_PROTO_H__ */" >> $@

1
compel/include/uapi/plugins Symbolic link
View file

@ -0,0 +1 @@
../../plugins/include/uapi

7
compel/plugins/Makefile
View file

@ -6,6 +6,13 @@ PLUGIN_ARCH_DIR := compel/arch/$(ARCH)/plugins
#
# CFLAGS, ASFLAGS, LDFLAGS
#
# UAPI inclusion, referred as <compel/...>
ccflags-y += -I compel/include/uapi
ccflags-y += -I compel/plugins/include/uapi
asflags-y += -I compel/include/uapi
asflags-y += -I compel/plugins/include/uapi
# General compel includes
ccflags-y += -iquote $(SRC_DIR)/compel/include
ccflags-y += -fno-stack-protector

2
compel/plugins/include/uapi/std/syscall-types.h
View file

@ -51,6 +51,6 @@ struct krlimit {
/* Type of timers in the kernel. */
typedef int kernel_timer_t;
#include "uapi/std/asm/syscall-types.h"
#include <compel/plugins/std/asm/syscall-types.h>
#endif /* COMPEL_SYSCALL_TYPES_H__ */

5
criu/Makefile
View file

@ -17,9 +17,8 @@ ccflags-y += -iquote $(SRC_DIR)/$(ARCH_DIR)
ccflags-y += -iquote $(SRC_DIR)/$(ARCH_DIR)/include
ccflags-y += -iquote $(SRC_DIR)/
ccflags-y += -I/usr/include/libnl3
ccflags-y += -iquote compel/plugins/include
ccflags-y += -iquote compel/include
ccflags-y += -iquote compel/arch/$(ARCH)/plugins/std
ccflags-y += -I compel/include/uapi
ccflags-y += -I compel/plugins/include/uapi
export ccflags-y

5
criu/Makefile.crtools
View file

@ -1,7 +1,6 @@
ccflags-y += -iquote criu/$(ARCH)
ccflags-y += -iquote compel/plugins/include
ccflags-y += -iquote compel/include
ccflags-y += -iquote compel/arch/$(ARCH)/plugins/std
ccflags-y += -I compel/include/uapi
ccflags-y += -I compel/plugins/include/uapi
obj-y += infect.o
obj-y += infect-rpc.o

4
criu/arch/aarch64/Makefile
View file

@ -3,8 +3,8 @@ builtin-name := crtools.built-in.o
ccflags-y += -iquote $(obj) -iquote $(SRC_DIR)
ccflags-y += -iquote $(obj)/include -iquote $(SRC_DIR)/criu/include
ccflags-y += -iquote $(SRC_DIR)/include
ccflags-y += -iquote $(SRC_DIR)/compel/plugins/include
ccflags-y += -iquote $(SRC_DIR)/compel/include
ccflags-y += -I compel/include/uapi
ccflags-y += -I compel/plugins/include/uapi
asflags-y += -D__ASSEMBLY__
obj-y += cpu.o

2
criu/arch/aarch64/include/asm/types.h
View file

@ -10,7 +10,7 @@
#include "bitops.h"
#include "asm/int.h"
#include "uapi/std/asm/syscall-types.h"
#include <compel/plugins/std/asm/syscall-types.h>
#define core_is_compat(core) false

2
criu/arch/aarch64/infect.c
View file

@ -3,7 +3,7 @@
#include <sys/uio.h>
#include <linux/elf.h>
#include "asm/parasite-syscall.h"
#include "uapi/std/syscall-codes.h"
#include <compel/plugins/std/syscall-codes.h>
#include "asm/types.h"
#include "criu-log.h"
#include "kerndat.h"

2
criu/arch/aarch64/restorer.c
View file

@ -3,7 +3,7 @@
#include "restorer.h"
#include "asm/restorer.h"
#include "uapi/std/syscall.h"
#include <compel/plugins/std/syscall.h>
#include "log.h"
#include "asm/fpu.h"
#include "cpu.h"

2
criu/arch/aarch64/vdso-pie.c
View file

@ -2,7 +2,7 @@
#include "asm/types.h"
#include "uapi/std/syscall.h"
#include <compel/plugins/std/syscall.h>
#include "parasite-vdso.h"
#include "log.h"
#include "common/bug.h"

5
criu/arch/arm/Makefile
View file

@ -2,8 +2,9 @@ builtin-name := crtools.built-in.o
ccflags-y += -iquote $(obj) -iquote $(SRC_DIR) -iquote $(obj)/include
ccflags-y += -iquote $(SRC_DIR)/criu/include -iquote $(SRC_DIR)/include
ccflags-y += -iquote $(SRC_DIR)/compel/plugins/include
ccflags-y += -iquote $(SRC_DIR)/compel/include
ccflags-y += -I compel/include/uapi
ccflags-y += -I compel/plugins/include/uapi
asflags-y += -D__ASSEMBLY__

2
criu/arch/arm/include/asm/types.h
View file

@ -9,7 +9,7 @@
#include "bitops.h"
#include "asm/int.h"
#include "uapi/std/asm/syscall-types.h"
#include <compel/plugins/std/asm/syscall-types.h>
#define core_is_compat(core) false

2
criu/arch/arm/infect.c
View file

@ -1,7 +1,7 @@
#include <sys/ptrace.h>
#include <sys/types.h>
#include "asm/parasite-syscall.h"
#include "uapi/std/syscall-codes.h"
#include <compel/plugins/std/syscall-codes.h>
#include "asm/types.h"
#include "criu-log.h"
#include "kerndat.h"

2
criu/arch/arm/restorer.c
View file

@ -3,7 +3,7 @@
#include "restorer.h"
#include "asm/restorer.h"
#include "uapi/std/syscall.h"
#include <compel/plugins/std/syscall.h>
#include "log.h"
#include "asm/fpu.h"
#include "cpu.h"

4
criu/arch/ppc64/Makefile
View file

@ -2,8 +2,8 @@ builtin-name := crtools.built-in.o
ccflags-y += -iquote $(obj) -iquote $(SRC_DIR) -iquote $(obj)/include
ccflags-y += -iquote $(SRC_DIR)/criu/include -iquote $(SRC_DIR)/include
ccflags-y += -iquote $(SRC_DIR)/compel/plugins/include
ccflags-y += -iquote $(SRC_DIR)/compel/include
ccflags-y += -I compel/include/uapi
ccflags-y += -I compel/plugins/include/uapi
obj-y += cpu.o
obj-y += crtools.o

2
criu/arch/ppc64/include/asm/types.h
View file

@ -9,7 +9,7 @@
#include "bitops.h"
#include "asm/int.h"
#include "uapi/std/asm/syscall-types.h"
#include <compel/plugins/std/asm/syscall-types.h>
typedef UserPpc64RegsEntry UserRegsEntry;

2
criu/arch/ppc64/infect.c
View file

@ -2,7 +2,7 @@
#include <sys/types.h>
#include <sys/uio.h>
#include <errno.h>
#include "uapi/std/syscall-codes.h"
#include <compel/plugins/std/syscall-codes.h>
#include "asm/types.h"
#include "ptrace.h"
#include "parasite-syscall.h"

2
criu/arch/ppc64/restorer.c
View file

@ -4,7 +4,7 @@
#include "asm/restorer.h"
#include "asm/fpu.h"
#include "uapi/std/syscall.h"
#include <compel/plugins/std/syscall.h>
#include "log.h"
int restore_nonsigframe_gpregs(UserPpc64RegsEntry *r)

2
criu/arch/ppc64/vdso-pie.c
View file

@ -3,7 +3,7 @@
#include "asm/types.h"
#include "uapi/std/syscall.h"
#include <compel/plugins/std/syscall.h>
#include "parasite-vdso.h"
#include "log.h"
#include "common/bug.h"

4
criu/arch/x86/Makefile
View file

@ -2,8 +2,8 @@ builtin-name := crtools.built-in.o
ccflags-y += -iquote $(obj) -iquote $(SRC_DIR) -iquote $(obj)/include
ccflags-y += -iquote $(SRC_DIR)/criu/include -iquote $(SRC_DIR)/include
ccflags-y += -iquote $(SRC_DIR)/compel/plugins/include
ccflags-y += -iquote $(SRC_DIR)/compel/include
ccflags-y += -I compel/include/uapi
ccflags-y += -I compel/plugins/include/uapi
asflags-y += -Wstrict-prototypes -Wa,--noexecstack
asflags-y += -D__ASSEMBLY__ -nostdlib -fomit-frame-pointer

2
criu/arch/x86/crtools.c
View file

@ -19,7 +19,7 @@
#include "log.h"
#include "util.h"
#include "cpu.h"
#include "uapi/std/syscall-codes.h"
#include <compel/plugins/std/syscall-codes.h>
#include "kerndat.h"
#include "infect.h"

2
criu/arch/x86/include/asm/infect-types.h
View file

@ -7,7 +7,7 @@
#include "log.h"
#include "common/bug.h"
#include "common/page.h"
#include "syscall-types.h"
#include <compel/plugins/std/asm/syscall-types.h>
#define SIGMAX 64
#define SIGMAX_OLD 31

2
criu/arch/x86/include/asm/restorer.h
View file

@ -4,7 +4,7 @@
#include "asm/types.h"
#include "asm/fpu.h"
#include "images/core.pb-c.h"
#include "uapi/std/syscall-codes.h"
#include <compel/plugins/std/syscall-codes.h>
#include "sigframe.h"

2
criu/arch/x86/include/asm/types.h
View file

@ -8,7 +8,7 @@
#include "bitops.h"
#include "asm/int.h"
#include "uapi/std/asm/syscall-types.h"
#include <compel/plugins/std/asm/syscall-types.h>
#include "images/core.pb-c.h"

4
criu/arch/x86/infect.c
View file

@ -11,8 +11,8 @@
#include "compel/include/asm/processor-flags.h"
#include "compel/include/errno.h"
#include "uapi/std/syscall-codes.h"
#include "compel/include/asm/syscall.h"
#include <compel/plugins/std/syscall-codes.h>
#include <compel/plugins/std/syscall.h>
#include "compel/include/asm/ptrace.h"
#include "common/err.h"
#include "asm/infect-types.h"

2
criu/arch/x86/restorer.c
View file

@ -7,7 +7,7 @@
#include "asm/fpu.h"
#include "asm/string.h"
#include "uapi/std/syscall.h"
#include <compel/plugins/std/syscall.h>
#include "log.h"
#include "cpu.h"

2
criu/arch/x86/sigaction_compat.c
View file

@ -5,7 +5,7 @@
#include <sys/mman.h>
#ifdef CR_NOGLIBC
# include "uapi/std/syscall.h"
# include <compel/plugins/std/syscall.h>
#else
# define sys_mmap mmap
# define sys_munmap munmap

2
criu/arch/x86/vdso-pie.c
View file

@ -3,7 +3,7 @@
#include "string.h"
#include "asm/types.h"
#include "uapi/std/syscall.h"
#include <compel/plugins/std/syscall.h>
#include "parasite-vdso.h"
#include "log.h"
#include "common/bug.h"

2
criu/cr-restore.c
View file

@ -80,7 +80,7 @@
#include "parasite-syscall.h"
#include "files-reg.h"
#include "uapi/std/syscall-codes.h"
#include <compel/plugins/std/syscall-codes.h>
#include "compel/include/asm/syscall.h"
#include "protobuf.h"

2
criu/fsnotify.c
View file

@ -41,7 +41,7 @@
#include "namespaces.h"
#include "pstree.h"
#include "fault-injection.h"
#include "uapi/std/syscall-codes.h"
#include <compel/plugins/std/syscall-codes.h>
#include "protobuf.h"
#include "images/fsnotify.pb-c.h"

2
criu/include/infect.h
View file

@ -2,7 +2,7 @@
#define __COMPEL_INFECT_H__
#include "asm/infect-types.h"
#include "compel/include/uapi/ksigset.h"
#include <compel/ksigset.h>
#define PARASITE_START_AREA_MIN (4096)

3
criu/include/sigframe-common.h
View file

@ -9,8 +9,7 @@
#endif
#include <signal.h>
#include "syscall-types.h"
#include "asm/types.h"
#include <compel/plugins/std/asm/syscall-types.h>
struct rt_sigframe;

4
criu/infect.c
View file

@ -16,8 +16,8 @@
#include "common/xmalloc.h"
#include "lock.h"
#include "uapi/std/syscall-codes.h"
#include "uapi/std/asm/syscall-types.h"
#include <compel/plugins/std/syscall-codes.h>
#include <compel/plugins/std/asm/syscall-types.h>
#include "compel/include/asm/ptrace.h"
#include "compel/include/asm/syscall.h"
#include "asm/sigframe.h"

2
criu/kerndat.c
View file

@ -27,7 +27,7 @@
#include "proc_parse.h"
#include "config.h"
#include "sk-inet.h"
#include "uapi/std/syscall-codes.h"
#include <compel/plugins/std/syscall-codes.h>
struct kerndat_s kdat = {
};

2
criu/parasite-syscall.c
View file

@ -29,7 +29,7 @@
#include "proc_parse.h"
#include "aio.h"
#include "fault-injection.h"
#include "uapi/std/syscall-codes.h"
#include <compel/plugins/std/syscall-codes.h>
#include "signal.h"
#include "sigframe.h"

5
criu/pie/Makefile
View file

@ -46,7 +46,6 @@ target += $(parasite_target) restorer
#
CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS))
CFLAGS := $(filter-out -DCONFIG_X86_64,$(CFLAGS))
CFLAGS += -iquote $(SRC_DIR)/compel/include
CFLAGS += -iquote $(SRC_DIR)/criu/arch/$(ARCH)/include
CFLAGS += -iquote $(SRC_DIR)/criu/include
CFLAGS += -iquote $(SRC_DIR)/include
@ -54,8 +53,8 @@ CFLAGS += -iquote $(SRC_DIR)
CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
CFLAGS += -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=0
ccflags-y += -iquote $(SRC_DIR)/compel/plugins/include
ccflags-y += -iquote $(SRC_DIR)/compel/include
ccflags-y += -I compel/include/uapi
ccflags-y += -I compel/plugins/include/uapi
ccflags-y += -DCR_NOGLIBC
ifneq ($(filter-out clean mrproper,$(MAKECMDGOALS)),)
NATIVE_CFLAGS := $(shell $(SRC_DIR)/compel/compel-host --arch=$(ARCH) cflags)

4
criu/pie/Makefile.library
View file

@ -61,8 +61,8 @@ iquotes += -iquote $(SRC_DIR)/$(ARCH_DIR)/include
iquotes += -iquote $(SRC_DIR) -iquote $(SRC_DIR)/criu/include -iquote $(SRC_DIR)/include
CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS)) $(iquotes)
asflags-y := -D__ASSEMBLY__ $(iquotes)
ccflags-y += -iquote $(SRC_DIR)/compel/plugins/include
ccflags-y += -iquote $(SRC_DIR)/compel/include
ccflags-y += -I compel/plugins/include/uapi
ccflags-y += -I compel/include/uapi
ifeq ($(SRCARCH),arm)
ccflags-y += -marm

2
criu/pie/log-simple.c
View file

@ -4,7 +4,7 @@
#include "types.h"
#include "string.h"
#include "common/bitsperlong.h"
#include "uapi/std/syscall.h"
#include <compel/plugins/std/syscall.h>
#include "log.h"
struct simple_buf {

2
criu/pie/parasite-vdso.c
View file

@ -12,7 +12,7 @@
#include "int.h"
#include "types.h"
#include "page.h"
#include "uapi/std/syscall.h"
#include <compel/plugins/std/syscall.h>
#include "image.h"
#include "parasite-vdso.h"
#include "vma.h"

2
criu/pie/parasite.c
View file

@ -9,7 +9,7 @@
#include "int.h"
#include "types.h"
#include "uapi/std/syscall.h"
#include <compel/plugins/std/syscall.h>
#include "parasite.h"
#include "config.h"
#include "fcntl.h"

2
criu/pie/pie-relocs.c
View file

@ -17,7 +17,7 @@
#include "log.h"
#include "common/compiler.h"
#include "compel/include/uapi/compel.h"
#include <compel/compel.h>
#include "common/bug.h"
__maybe_unused void elf_relocs_apply(void *mem, void *vbase, size_t size, compel_reloc_t *elf_relocs, size_t nr_relocs)

2
criu/pie/pie-relocs.h
View file

@ -1,7 +1,7 @@
#ifndef __PIE_RELOCS_H__
#define __PIE_RELOCS_H__
#include "compel/include/uapi/compel.h"
#include <compel/compel.h>
#include "common/compiler.h"
#include "config.h"

4
criu/pie/restorer.c
View file

@ -21,8 +21,8 @@
#include "types.h"
#include "common/compiler.h"
#include "string.h"
#include "uapi/std/syscall.h"
#include "uapi/ksigset.h"
#include <compel/plugins/std/syscall.h>
#include <compel/ksigset.h>
#include "signal.h"
#include "config.h"
#include "prctl.h"

2
criu/pie/util-fd.c
View file

@ -11,7 +11,7 @@
#include "string.h"
#ifdef CR_NOGLIBC
# include "uapi/std/syscall.h"
# include <compel/plugins/std/syscall.h>
# define __sys(foo) sys_##foo
# define __sys_err(ret) ret
#else

2
criu/pie/util.c
View file

@ -13,7 +13,7 @@
#include "util-pie.h"
#ifdef CR_NOGLIBC
# include "uapi/std/syscall.h"
# include <compel/plugins/std/syscall.h>
# define __sys(foo) sys_##foo
#else
# define __sys(foo) foo

2
criu/shmem.c
View file

@ -16,7 +16,7 @@
#include "vma.h"
#include "mem.h"
#include "config.h"
#include "uapi/std/syscall-codes.h"
#include <compel/plugins/std/syscall-codes.h>
#include "bitops.h"
#include "log.h"
#include "types.h"

2
include/common/lock.h
View file

@ -15,7 +15,7 @@
#define LOCK_BUG() LOCK_BUG_ON(1)
#ifdef CR_NOGLIBC
# include "uapi/std/syscall.h"
# include <compel/plugins/std/syscall.h>
#else
# include <unistd.h>
# include <sys/syscall.h>