Skip to content

C
criu
Commit a0810481 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Andrei Vagin
Browse files
Options

compel: Include compel headers as system ones 

Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent a714fff5
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 83 deletions
Makefile.compel
View file @ a0810481
...@@ -26,30 +26,38 @@ $(SRC_DIR)/compel/include/asm: $(SRC_DIR)/compel/arch/$(ARCH)/src/lib/include ...@@ -26,30 +26,38 @@ $(SRC_DIR)/compel/include/asm: $(SRC_DIR)/compel/arch/$(ARCH)/src/lib/include
$(Q) ln -s $^ $@ $(Q) ln -s $^ $@
$(COMPEL_VERSION_HEADER): $(SRC_DIR)/compel/include/asm $(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 itself.
compel/%: $(COMPEL_VERSION_HEADER) $(CONFIG_HEADER) .FORCE compel/%: $(compel-deps) .FORCE
$(Q) $(MAKE) $(build)=compel $@ $(Q) $(MAKE) $(build)=compel $@
# #
# Plugins # Plugins
compel/plugins/%: $(COMPEL_VERSION_HEADER) $(CONFIG_HEADER) .FORCE compel/plugins/%: $(compel-deps) .FORCE
$(Q) $(MAKE) $(build)=compel/plugins $@ $(Q) $(MAKE) $(build)=compel/plugins $@
# #
# GNU make 4.x supports targets matching via wide # GNU make 4.x supports targets matching via wide
# match targeting, where GNU make 3.x series (used on # match targeting, where GNU make 3.x series (used on
# Travis) is not, so we have to write them here explicitly. # 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 $@ $(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 $@ $(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 $@ $(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, $@) $(call msg-link, $@)
$(Q) $(CC) $(CFLAGS) $^ $(WRAPFLAGS) $(LDFLAGS) -rdynamic -o $@ $(Q) $(CC) $(CFLAGS) $^ $(WRAPFLAGS) $(LDFLAGS) -rdynamic -o $@
......
compel/Makefile
View file @ a0810481
...@@ -9,6 +9,11 @@ ccflags-y += -iquote compel/include ...@@ -9,6 +9,11 @@ ccflags-y += -iquote compel/include
ccflags-y += -iquote compel/plugins/include ccflags-y += -iquote compel/plugins/include
ccflags-y += -fPIC 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 lib-y += arch/$(ARCH)/src/lib/handle-elf.o
host-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 lib-y += src/lib/handle-elf.o
......
compel/arch/arm/plugins/std/syscalls/gen-syscalls.pl
View file @ a0810481
...@@ -6,14 +6,14 @@ use warnings; ...@@ -6,14 +6,14 @@ use warnings;
my $in = $ARGV[0]; my $in = $ARGV[0];
my $codesout = $ARGV[1]; my $codesout = $ARGV[1];
my $codes = $ARGV[1]; my $codes = $ARGV[1];
$codes =~ s/.*include\///g; $codes =~ s/.*include\/uapi\//compel\/plugins\//g;
my $protosout = $ARGV[2]; my $protosout = $ARGV[2];
my $protos = $ARGV[2]; my $protos = $ARGV[2];
$protos =~ s/.*include\///g; $protos =~ s/.*include\/uapi\//compel\/plugins\//g;
my $asmout = $ARGV[3]; my $asmout = $ARGV[3];
my $asmcommon = $ARGV[4]; my $asmcommon = $ARGV[4];
my $prototypes = $ARGV[5]; my $prototypes = $ARGV[5];
$prototypes =~ s/.*include\///g; $prototypes =~ s/.*include\/uapi\//compel\/plugins\//g;
my $bits = $ARGV[6]; my $bits = $ARGV[6];
my $codesdef = $codes; my $codesdef = $codes;
...@@ -42,13 +42,13 @@ print PROTOSOUT <<"END"; ...@@ -42,13 +42,13 @@ print PROTOSOUT <<"END";
/* Autogenerated, don't edit */ /* Autogenerated, don't edit */
#ifndef $protosdef #ifndef $protosdef
#define $protosdef #define $protosdef
#include "$prototypes" #include <$prototypes>
#include "$codes" #include <$codes>
END END
print ASMOUT <<"END"; print ASMOUT <<"END";
/* Autogenerated, don't edit */ /* Autogenerated, don't edit */
#include "$codes" #include <$codes>
#include "$asmcommon" #include "$asmcommon"
END END
...@@ -91,8 +91,8 @@ for (<IN>) { ...@@ -91,8 +91,8 @@ for (<IN>) {
} }
if ($need_aux == 1) { if ($need_aux == 1) {
print ASMOUT "#include \"uapi/std/syscall-aux.S\"\n"; print ASMOUT "#include <compel/plugins/std/syscall-aux.S>\n";
print CODESOUT "#include \"uapi/std/syscall-aux.h\"\n"; print CODESOUT "#include <compel/plugins/std/syscall-aux.h>\n";
} }
print CODESOUT "#endif /* $codesdef */"; print CODESOUT "#endif /* $codesdef */";
......
compel/arch/ppc64/plugins/std/syscalls/Makefile.syscalls
View file @ a0810481
...@@ -29,15 +29,15 @@ $(sys-proto): $(sys-def) ...@@ -29,15 +29,15 @@ $(sys-proto): $(sys-def)
$(Q) echo "/* Autogenerated, don't edit */" > $@ $(Q) echo "/* Autogenerated, don't edit */" > $@
$(Q) echo "#ifndef __ASM_CR_SYSCALL_PROTO_H__" >> $@ $(Q) echo "#ifndef __ASM_CR_SYSCALL_PROTO_H__" >> $@
$(Q) echo "#define __ASM_CR_SYSCALL_PROTO_H__" >> $@ $(Q) echo "#define __ASM_CR_SYSCALL_PROTO_H__" >> $@
$(Q) echo "#include \"uapi/std/syscall-codes.h\"" >> $@ $(Q) echo "#include <compel/plugins/std/syscall-codes.h>" >> $@
$(Q) echo "#include \"uapi/std/syscall-types.h\"" >> $@ $(Q) echo "#include <compel/plugins/std/syscall-types.h>" >> $@
$(Q) cat $< | awk '/^__NR/{print "extern long", $$3, substr($$0, index($$0,$$4)), ";"}' >> $@ $(Q) cat $< | awk '/^__NR/{print "extern long", $$3, substr($$0, index($$0,$$4)), ";"}' >> $@
$(Q) echo "#endif /* __ASM_CR_SYSCALL_PROTO_H__ */" >> $@ $(Q) echo "#endif /* __ASM_CR_SYSCALL_PROTO_H__ */" >> $@
$(sys-asm): $(sys-def) $(sys-asm-common) $(sys-codes) $(sys-proto) $(sys-asm): $(sys-def) $(sys-asm-common) $(sys-codes) $(sys-proto)
$(E) " GEN " $@ $(E) " GEN " $@
$(Q) echo "/* Autogenerated, don't edit */" > $@ $(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) echo "#include \"$(sys-asm-common-name)\"" >> $@
$(Q) cat $< | awk '/^__NR/{print "SYSCALL(", $$3, ",", $$2, ")"}' >> $@ $(Q) cat $< | awk '/^__NR/{print "SYSCALL(", $$3, ",", $$2, ")"}' >> $@
......
compel/arch/x86/plugins/std/syscalls/Makefile.syscalls
View file @ a0810481
...@@ -39,8 +39,8 @@ $(sys-proto): $(sys-def) $(sys-proto-types) ...@@ -39,8 +39,8 @@ $(sys-proto): $(sys-def) $(sys-proto-types)
$(Q) echo "/* Autogenerated, don't edit */" > $$@ $(Q) echo "/* Autogenerated, don't edit */" > $$@
$(Q) echo "#ifndef ASM_SYSCALL_PROTO_H_$(1)__" >> $$@ $(Q) echo "#ifndef ASM_SYSCALL_PROTO_H_$(1)__" >> $$@
$(Q) echo "#define 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 <compel/plugins/std/syscall-codes-$(1).h>' >> $$@
$(Q) echo '#include "uapi/std/syscall-types.h"' >> $$@ $(Q) echo '#include <compel/plugins/std/syscall-types.h>' >> $$@
ifeq ($(1),32) ifeq ($(1),32)
$(Q) echo '#include "asm/syscall32.h"' >> $$@ $(Q) echo '#include "asm/syscall32.h"' >> $$@
endif endif
...@@ -53,7 +53,7 @@ define gen-rule-sys-asm ...@@ -53,7 +53,7 @@ define gen-rule-sys-asm
$(sys-asm): $(sys-def) $(sys-asm-common) $(sys-codes) $(sys-proto) $(sys-proto-types) $(sys-asm): $(sys-def) $(sys-asm-common) $(sys-codes) $(sys-proto) $(sys-proto-types)
$(call msg-gen, $$@) $(call msg-gen, $$@)
$(Q) echo "/* Autogenerated, don't edit */" > $$@ $(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) echo '#include "$(sys-asm-common-name)"' >> $$@
$(Q) cat $$< | awk '/^__NR/{print "SYSCALL(", $(AV)3, ",", $(AV)2, ")"}' >> $$@ $(Q) cat $$< | awk '/^__NR/{print "SYSCALL(", $(AV)3, ",", $(AV)2, ")"}' >> $$@
endef endef
...@@ -71,7 +71,7 @@ $(sys-codes-generic): $(PLUGIN_ARCH_DIR)/std/syscalls/syscall_32.tbl $(sys-proto ...@@ -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 "/* Autogenerated, don't edit */" > $@
$(Q) echo "#ifndef __ASM_CR_SYSCALL_CODES_H__" >> $@ $(Q) echo "#ifndef __ASM_CR_SYSCALL_CODES_H__" >> $@
$(Q) echo "#define __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; \ $(Q) cat $< | awk '/^__NR/{NR32=$$1; \
sub("^__NR", "__NR32", NR32); \ sub("^__NR", "__NR32", NR32); \
print "\n#ifndef ", NR32; \ print "\n#ifndef ", NR32; \
...@@ -87,9 +87,9 @@ $(sys-proto-generic): $(strip $(call map,sys-proto,$(sys-bits))) $(sys-proto-typ ...@@ -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 "#define __ASM_CR_SYSCALL_PROTO_H__" >> $@
$(Q) echo "" >> $@ $(Q) echo "" >> $@
$(Q) echo "#ifdef CONFIG_X86_32" >> $@ $(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 "#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 "#endif /* CONFIG_X86_32 */" >> $@
$(Q) echo "" >> $@ $(Q) echo "" >> $@
$(Q) echo "#endif /* __ASM_CR_SYSCALL_PROTO_H__ */" >> $@ $(Q) echo "#endif /* __ASM_CR_SYSCALL_PROTO_H__ */" >> $@
......
compel/include/uapi/plugins 0 → 120000
View file @ a0810481
../../plugins/include/uapi
\ No newline at end of file
compel/plugins/Makefile
View file @ a0810481
...@@ -6,6 +6,13 @@ PLUGIN_ARCH_DIR := compel/arch/$(ARCH)/plugins ...@@ -6,6 +6,13 @@ PLUGIN_ARCH_DIR := compel/arch/$(ARCH)/plugins
# #
# CFLAGS, ASFLAGS, LDFLAGS # 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 # General compel includes
ccflags-y += -iquote $(SRC_DIR)/compel/include ccflags-y += -iquote $(SRC_DIR)/compel/include
ccflags-y += -fno-stack-protector ccflags-y += -fno-stack-protector
......
compel/plugins/include/uapi/std/syscall-types.h
View file @ a0810481
...@@ -51,6 +51,6 @@ struct krlimit { ...@@ -51,6 +51,6 @@ struct krlimit {
/* Type of timers in the kernel. */ /* Type of timers in the kernel. */
typedef int kernel_timer_t; 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__ */ #endif /* COMPEL_SYSCALL_TYPES_H__ */
criu/Makefile
View file @ a0810481
...@@ -17,9 +17,8 @@ ccflags-y += -iquote $(SRC_DIR)/$(ARCH_DIR) ...@@ -17,9 +17,8 @@ ccflags-y += -iquote $(SRC_DIR)/$(ARCH_DIR)
ccflags-y += -iquote $(SRC_DIR)/$(ARCH_DIR)/include ccflags-y += -iquote $(SRC_DIR)/$(ARCH_DIR)/include
ccflags-y += -iquote $(SRC_DIR)/ ccflags-y += -iquote $(SRC_DIR)/
ccflags-y += -I/usr/include/libnl3 ccflags-y += -I/usr/include/libnl3
ccflags-y += -iquote compel/plugins/include ccflags-y += -I compel/include/uapi
ccflags-y += -iquote compel/include ccflags-y += -I compel/plugins/include/uapi
ccflags-y += -iquote compel/arch/$(ARCH)/plugins/std
export ccflags-y export ccflags-y
......
criu/Makefile.crtools
View file @ a0810481
ccflags-y += -iquote criu/$(ARCH) ccflags-y += -iquote criu/$(ARCH)
ccflags-y += -iquote compel/plugins/include ccflags-y += -I compel/include/uapi
ccflags-y += -iquote compel/include ccflags-y += -I compel/plugins/include/uapi
ccflags-y += -iquote compel/arch/$(ARCH)/plugins/std
obj-y += infect.o obj-y += infect.o
obj-y += infect-rpc.o obj-y += infect-rpc.o
......
criu/arch/aarch64/Makefile
View file @ a0810481
...@@ -3,8 +3,8 @@ builtin-name := crtools.built-in.o ...@@ -3,8 +3,8 @@ builtin-name := crtools.built-in.o
ccflags-y += -iquote $(obj) -iquote $(SRC_DIR) ccflags-y += -iquote $(obj) -iquote $(SRC_DIR)
ccflags-y += -iquote $(obj)/include -iquote $(SRC_DIR)/criu/include ccflags-y += -iquote $(obj)/include -iquote $(SRC_DIR)/criu/include
ccflags-y += -iquote $(SRC_DIR)/include ccflags-y += -iquote $(SRC_DIR)/include
ccflags-y += -iquote $(SRC_DIR)/compel/plugins/include ccflags-y += -I compel/include/uapi
ccflags-y += -iquote $(SRC_DIR)/compel/include ccflags-y += -I compel/plugins/include/uapi
asflags-y += -D__ASSEMBLY__ asflags-y += -D__ASSEMBLY__
obj-y += cpu.o obj-y += cpu.o
......
criu/arch/aarch64/include/asm/types.h
View file @ a0810481
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "bitops.h" #include "bitops.h"
#include "asm/int.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 #define core_is_compat(core) false
......
criu/arch/aarch64/infect.c
View file @ a0810481
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <sys/uio.h> #include <sys/uio.h>
#include <linux/elf.h> #include <linux/elf.h>
#include "asm/parasite-syscall.h" #include "asm/parasite-syscall.h"
#include "uapi/std/syscall-codes.h" #include <compel/plugins/std/syscall-codes.h>
#include "asm/types.h" #include "asm/types.h"
#include "criu-log.h" #include "criu-log.h"
#include "kerndat.h" #include "kerndat.h"
......
criu/arch/aarch64/restorer.c
View file @ a0810481
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "restorer.h" #include "restorer.h"
#include "asm/restorer.h" #include "asm/restorer.h"
#include "uapi/std/syscall.h" #include <compel/plugins/std/syscall.h>
#include "log.h" #include "log.h"
#include "asm/fpu.h" #include "asm/fpu.h"
#include "cpu.h" #include "cpu.h"
......
criu/arch/aarch64/vdso-pie.c
View file @ a0810481
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "asm/types.h" #include "asm/types.h"
#include "uapi/std/syscall.h" #include <compel/plugins/std/syscall.h>
#include "parasite-vdso.h" #include "parasite-vdso.h"
#include "log.h" #include "log.h"
#include "common/bug.h" #include "common/bug.h"
......
criu/arch/arm/Makefile
View file @ a0810481
...@@ -2,8 +2,9 @@ builtin-name := crtools.built-in.o ...@@ -2,8 +2,9 @@ builtin-name := crtools.built-in.o
ccflags-y += -iquote $(obj) -iquote $(SRC_DIR) -iquote $(obj)/include 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)/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__ asflags-y += -D__ASSEMBLY__
......
criu/arch/arm/include/asm/types.h
View file @ a0810481
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "bitops.h" #include "bitops.h"
#include "asm/int.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 #define core_is_compat(core) false
......
criu/arch/arm/infect.c
View file @ a0810481
#include <sys/ptrace.h> #include <sys/ptrace.h>
#include <sys/types.h> #include <sys/types.h>
#include "asm/parasite-syscall.h" #include "asm/parasite-syscall.h"
#include "uapi/std/syscall-codes.h" #include <compel/plugins/std/syscall-codes.h>
#include "asm/types.h" #include "asm/types.h"
#include "criu-log.h" #include "criu-log.h"
#include "kerndat.h" #include "kerndat.h"
......
criu/arch/arm/restorer.c
View file @ a0810481
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "restorer.h" #include "restorer.h"
#include "asm/restorer.h" #include "asm/restorer.h"
#include "uapi/std/syscall.h" #include <compel/plugins/std/syscall.h>
#include "log.h" #include "log.h"
#include "asm/fpu.h" #include "asm/fpu.h"
#include "cpu.h" #include "cpu.h"
......
criu/arch/ppc64/Makefile
View file @ a0810481
...@@ -2,8 +2,8 @@ builtin-name := crtools.built-in.o ...@@ -2,8 +2,8 @@ builtin-name := crtools.built-in.o
ccflags-y += -iquote $(obj) -iquote $(SRC_DIR) -iquote $(obj)/include 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)/criu/include -iquote $(SRC_DIR)/include
ccflags-y += -iquote $(SRC_DIR)/compel/plugins/include ccflags-y += -I compel/include/uapi
ccflags-y += -iquote $(SRC_DIR)/compel/include ccflags-y += -I compel/plugins/include/uapi
obj-y += cpu.o obj-y += cpu.o
obj-y += crtools.o obj-y += crtools.o
......
criu/arch/ppc64/include/asm/types.h
View file @ a0810481
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "bitops.h" #include "bitops.h"
#include "asm/int.h" #include "asm/int.h"
#include "uapi/std/asm/syscall-types.h" #include <compel/plugins/std/asm/syscall-types.h>
typedef UserPpc64RegsEntry UserRegsEntry; typedef UserPpc64RegsEntry UserRegsEntry;
......
criu/arch/ppc64/infect.c
View file @ a0810481
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <errno.h> #include <errno.h>
#include "uapi/std/syscall-codes.h" #include <compel/plugins/std/syscall-codes.h>
#include "asm/types.h" #include "asm/types.h"
#include "ptrace.h" #include "ptrace.h"
#include "parasite-syscall.h" #include "parasite-syscall.h"
......
criu/arch/ppc64/restorer.c
View file @ a0810481
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include "asm/restorer.h" #include "asm/restorer.h"
#include "asm/fpu.h" #include "asm/fpu.h"
#include "uapi/std/syscall.h" #include <compel/plugins/std/syscall.h>
#include "log.h" #include "log.h"
int restore_nonsigframe_gpregs(UserPpc64RegsEntry *r) int restore_nonsigframe_gpregs(UserPpc64RegsEntry *r)
......
criu/arch/ppc64/vdso-pie.c
View file @ a0810481
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "asm/types.h" #include "asm/types.h"
#include "uapi/std/syscall.h" #include <compel/plugins/std/syscall.h>
#include "parasite-vdso.h" #include "parasite-vdso.h"
#include "log.h" #include "log.h"
#include "common/bug.h" #include "common/bug.h"
......
criu/arch/x86/Makefile
View file @ a0810481
...@@ -2,8 +2,8 @@ builtin-name := crtools.built-in.o ...@@ -2,8 +2,8 @@ builtin-name := crtools.built-in.o
ccflags-y += -iquote $(obj) -iquote $(SRC_DIR) -iquote $(obj)/include 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)/criu/include -iquote $(SRC_DIR)/include
ccflags-y += -iquote $(SRC_DIR)/compel/plugins/include ccflags-y += -I compel/include/uapi
ccflags-y += -iquote $(SRC_DIR)/compel/include ccflags-y += -I compel/plugins/include/uapi
asflags-y += -Wstrict-prototypes -Wa,--noexecstack asflags-y += -Wstrict-prototypes -Wa,--noexecstack
asflags-y += -D__ASSEMBLY__ -nostdlib -fomit-frame-pointer asflags-y += -D__ASSEMBLY__ -nostdlib -fomit-frame-pointer
......
criu/arch/x86/crtools.c
View file @ a0810481
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "log.h" #include "log.h"
#include "util.h" #include "util.h"
#include "cpu.h" #include "cpu.h"
#include "uapi/std/syscall-codes.h" #include <compel/plugins/std/syscall-codes.h>
#include "kerndat.h" #include "kerndat.h"
#include "infect.h" #include "infect.h"
......
criu/arch/x86/include/asm/infect-types.h
View file @ a0810481
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "log.h" #include "log.h"
#include "common/bug.h" #include "common/bug.h"
#include "common/page.h" #include "common/page.h"
#include "syscall-types.h" #include <compel/plugins/std/asm/syscall-types.h>
#define SIGMAX 64 #define SIGMAX 64
#define SIGMAX_OLD 31 #define SIGMAX_OLD 31
......
criu/arch/x86/include/asm/restorer.h
View file @ a0810481
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include "asm/types.h" #include "asm/types.h"
#include "asm/fpu.h" #include "asm/fpu.h"
#include "images/core.pb-c.h" #include "images/core.pb-c.h"
#include "uapi/std/syscall-codes.h" #include <compel/plugins/std/syscall-codes.h>
#include "sigframe.h" #include "sigframe.h"
......
criu/arch/x86/include/asm/types.h
View file @ a0810481
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "bitops.h" #include "bitops.h"
#include "asm/int.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" #include "images/core.pb-c.h"
......
criu/arch/x86/infect.c
View file @ a0810481
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
#include "compel/include/asm/processor-flags.h" #include "compel/include/asm/processor-flags.h"
#include "compel/include/errno.h" #include "compel/include/errno.h"
#include "uapi/std/syscall-codes.h" #include <compel/plugins/std/syscall-codes.h>
#include "compel/include/asm/syscall.h" #include <compel/plugins/std/syscall.h>
#include "compel/include/asm/ptrace.h" #include "compel/include/asm/ptrace.h"
#include "common/err.h" #include "common/err.h"
#include "asm/infect-types.h" #include "asm/infect-types.h"
......
criu/arch/x86/restorer.c
View file @ a0810481
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "asm/fpu.h" #include "asm/fpu.h"
#include "asm/string.h" #include "asm/string.h"
#include "uapi/std/syscall.h" #include <compel/plugins/std/syscall.h>
#include "log.h" #include "log.h"
#include "cpu.h" #include "cpu.h"
......
criu/arch/x86/sigaction_compat.c
View file @ a0810481
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <sys/mman.h> #include <sys/mman.h>
#ifdef CR_NOGLIBC #ifdef CR_NOGLIBC
# include "uapi/std/syscall.h" # include <compel/plugins/std/syscall.h>
#else #else
# define sys_mmap mmap # define sys_mmap mmap
# define sys_munmap munmap # define sys_munmap munmap
......
criu/arch/x86/vdso-pie.c
View file @ a0810481
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "string.h" #include "string.h"
#include "asm/types.h" #include "asm/types.h"
#include "uapi/std/syscall.h" #include <compel/plugins/std/syscall.h>
#include "parasite-vdso.h" #include "parasite-vdso.h"
#include "log.h" #include "log.h"
#include "common/bug.h" #include "common/bug.h"
......
criu/cr-restore.c
View file @ a0810481
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
#include "parasite-syscall.h" #include "parasite-syscall.h"
#include "files-reg.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 "compel/include/asm/syscall.h"
#include "protobuf.h" #include "protobuf.h"
......
criu/fsnotify.c
View file @ a0810481
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include "namespaces.h" #include "namespaces.h"
#include "pstree.h" #include "pstree.h"
#include "fault-injection.h" #include "fault-injection.h"
#include "uapi/std/syscall-codes.h" #include <compel/plugins/std/syscall-codes.h>
#include "protobuf.h" #include "protobuf.h"
#include "images/fsnotify.pb-c.h" #include "images/fsnotify.pb-c.h"
......
criu/include/infect.h
View file @ a0810481
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define __COMPEL_INFECT_H__ #define __COMPEL_INFECT_H__
#include "asm/infect-types.h" #include "asm/infect-types.h"
#include "compel/include/uapi/ksigset.h" #include <compel/ksigset.h>
#define PARASITE_START_AREA_MIN (4096) #define PARASITE_START_AREA_MIN (4096)
......
criu/include/sigframe-common.h
View file @ a0810481
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
#endif #endif
#include <signal.h> #include <signal.h>
#include "syscall-types.h" #include <compel/plugins/std/asm/syscall-types.h>
#include "asm/types.h"
struct rt_sigframe; struct rt_sigframe;
......
criu/infect.c
View file @ a0810481
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "common/xmalloc.h" #include "common/xmalloc.h"
#include "lock.h" #include "lock.h"
#include "uapi/std/syscall-codes.h" #include <compel/plugins/std/syscall-codes.h>
#include "uapi/std/asm/syscall-types.h" #include <compel/plugins/std/asm/syscall-types.h>
#include "compel/include/asm/ptrace.h" #include "compel/include/asm/ptrace.h"
#include "compel/include/asm/syscall.h" #include "compel/include/asm/syscall.h"
#include "asm/sigframe.h" #include "asm/sigframe.h"
......
criu/kerndat.c
View file @ a0810481
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "proc_parse.h" #include "proc_parse.h"
#include "config.h" #include "config.h"
#include "sk-inet.h" #include "sk-inet.h"
#include "uapi/std/syscall-codes.h" #include <compel/plugins/std/syscall-codes.h>
struct kerndat_s kdat = { struct kerndat_s kdat = {
}; };
......
criu/parasite-syscall.c
View file @ a0810481
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "proc_parse.h" #include "proc_parse.h"
#include "aio.h" #include "aio.h"
#include "fault-injection.h" #include "fault-injection.h"
#include "uapi/std/syscall-codes.h" #include <compel/plugins/std/syscall-codes.h>
#include "signal.h" #include "signal.h"
#include "sigframe.h" #include "sigframe.h"
......
criu/pie/Makefile
View file @ a0810481
...@@ -46,7 +46,6 @@ target += $(parasite_target) restorer ...@@ -46,7 +46,6 @@ target += $(parasite_target) restorer
# #
CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS)) CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS))
CFLAGS := $(filter-out -DCONFIG_X86_64,$(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/arch/$(ARCH)/include
CFLAGS += -iquote $(SRC_DIR)/criu/include CFLAGS += -iquote $(SRC_DIR)/criu/include
CFLAGS += -iquote $(SRC_DIR)/include CFLAGS += -iquote $(SRC_DIR)/include
...@@ -54,8 +53,8 @@ CFLAGS += -iquote $(SRC_DIR) ...@@ -54,8 +53,8 @@ CFLAGS += -iquote $(SRC_DIR)
CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
CFLAGS += -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=0 CFLAGS += -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=0
ccflags-y += -iquote $(SRC_DIR)/compel/plugins/include ccflags-y += -I compel/include/uapi
ccflags-y += -iquote $(SRC_DIR)/compel/include ccflags-y += -I compel/plugins/include/uapi
ccflags-y += -DCR_NOGLIBC ccflags-y += -DCR_NOGLIBC
ifneq ($(filter-out clean mrproper,$(MAKECMDGOALS)),) ifneq ($(filter-out clean mrproper,$(MAKECMDGOALS)),)
NATIVE_CFLAGS := $(shell $(SRC_DIR)/compel/compel-host --arch=$(ARCH) cflags) NATIVE_CFLAGS := $(shell $(SRC_DIR)/compel/compel-host --arch=$(ARCH) cflags)
......
criu/pie/Makefile.library
View file @ a0810481
...@@ -61,8 +61,8 @@ iquotes += -iquote $(SRC_DIR)/$(ARCH_DIR)/include ...@@ -61,8 +61,8 @@ iquotes += -iquote $(SRC_DIR)/$(ARCH_DIR)/include
iquotes += -iquote $(SRC_DIR) -iquote $(SRC_DIR)/criu/include -iquote $(SRC_DIR)/include iquotes += -iquote $(SRC_DIR) -iquote $(SRC_DIR)/criu/include -iquote $(SRC_DIR)/include
CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS)) $(iquotes) CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS)) $(iquotes)
asflags-y := -D__ASSEMBLY__ $(iquotes) asflags-y := -D__ASSEMBLY__ $(iquotes)
ccflags-y += -iquote $(SRC_DIR)/compel/plugins/include ccflags-y += -I compel/plugins/include/uapi
ccflags-y += -iquote $(SRC_DIR)/compel/include ccflags-y += -I compel/include/uapi
ifeq ($(SRCARCH),arm) ifeq ($(SRCARCH),arm)
ccflags-y += -marm ccflags-y += -marm
......
criu/pie/log-simple.c
View file @ a0810481
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include "types.h" #include "types.h"
#include "string.h" #include "string.h"
#include "common/bitsperlong.h" #include "common/bitsperlong.h"
#include "uapi/std/syscall.h" #include <compel/plugins/std/syscall.h>
#include "log.h" #include "log.h"
struct simple_buf { struct simple_buf {
......
criu/pie/parasite-vdso.c
View file @ a0810481
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include "int.h" #include "int.h"
#include "types.h" #include "types.h"
#include "page.h" #include "page.h"
#include "uapi/std/syscall.h" #include <compel/plugins/std/syscall.h>
#include "image.h" #include "image.h"
#include "parasite-vdso.h" #include "parasite-vdso.h"
#include "vma.h" #include "vma.h"
......
criu/pie/parasite.c
View file @ a0810481
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "int.h" #include "int.h"
#include "types.h" #include "types.h"
#include "uapi/std/syscall.h" #include <compel/plugins/std/syscall.h>
#include "parasite.h" #include "parasite.h"
#include "config.h" #include "config.h"
#include "fcntl.h" #include "fcntl.h"
......
criu/pie/pie-relocs.c
View file @ a0810481
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "log.h" #include "log.h"
#include "common/compiler.h" #include "common/compiler.h"
#include "compel/include/uapi/compel.h" #include <compel/compel.h>
#include "common/bug.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) __maybe_unused void elf_relocs_apply(void *mem, void *vbase, size_t size, compel_reloc_t *elf_relocs, size_t nr_relocs)
......
criu/pie/pie-relocs.h
View file @ a0810481
#ifndef __PIE_RELOCS_H__ #ifndef __PIE_RELOCS_H__
#define __PIE_RELOCS_H__ #define __PIE_RELOCS_H__
#include "compel/include/uapi/compel.h" #include <compel/compel.h>
#include "common/compiler.h" #include "common/compiler.h"
#include "config.h" #include "config.h"
......
criu/pie/restorer.c
View file @ a0810481
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#include "types.h" #include "types.h"
#include "common/compiler.h" #include "common/compiler.h"
#include "string.h" #include "string.h"
#include "uapi/std/syscall.h" #include <compel/plugins/std/syscall.h>
#include "uapi/ksigset.h" #include <compel/ksigset.h>
#include "signal.h" #include "signal.h"
#include "config.h" #include "config.h"
#include "prctl.h" #include "prctl.h"
......
criu/pie/util-fd.c
View file @ a0810481
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "string.h" #include "string.h"
#ifdef CR_NOGLIBC #ifdef CR_NOGLIBC
# include "uapi/std/syscall.h" # include <compel/plugins/std/syscall.h>
# define __sys(foo) sys_##foo # define __sys(foo) sys_##foo
# define __sys_err(ret) ret # define __sys_err(ret) ret
#else #else
......
criu/pie/util.c
View file @ a0810481
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "util-pie.h" #include "util-pie.h"
#ifdef CR_NOGLIBC #ifdef CR_NOGLIBC
# include "uapi/std/syscall.h" # include <compel/plugins/std/syscall.h>
# define __sys(foo) sys_##foo # define __sys(foo) sys_##foo
#else #else
# define __sys(foo) foo # define __sys(foo) foo
......
criu/shmem.c
View file @ a0810481
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "vma.h" #include "vma.h"
#include "mem.h" #include "mem.h"
#include "config.h" #include "config.h"
#include "uapi/std/syscall-codes.h" #include <compel/plugins/std/syscall-codes.h>
#include "bitops.h" #include "bitops.h"
#include "log.h" #include "log.h"
#include "types.h" #include "types.h"
......
include/common/lock.h
View file @ a0810481
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#define LOCK_BUG() LOCK_BUG_ON(1) #define LOCK_BUG() LOCK_BUG_ON(1)
#ifdef CR_NOGLIBC #ifdef CR_NOGLIBC
# include "uapi/std/syscall.h" # include <compel/plugins/std/syscall.h>
#else #else
# include <unistd.h> # include <unistd.h>
# include <sys/syscall.h> # include <sys/syscall.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