From 2fd16c39a6d78f315bcbe1ae2908a65ab3fb6ff7 Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Thu, 25 Feb 2016 11:41:00 +0300 Subject: [PATCH] build: gcov -- Don't gen gcov on blobs and syscalls They are running inside dumpee space so should not be injected with Gcov instructions. Signed-off-by: Cyrill Gorcunov Signed-off-by: Pavel Emelyanov --- Makefile | 5 ++++- criu/arch/aarch64/Makefile.syscalls | 2 ++ criu/arch/arm/Makefile.syscalls | 2 ++ criu/arch/ppc64/Makefile.syscalls | 2 ++ criu/arch/x86/Makefile.syscalls | 2 ++ criu/pie/Makefile | 2 +- criu/pie/Makefile.library | 2 +- 7 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 61b3d1d1f..f7f4e8c53 100644 --- a/Makefile +++ b/Makefile @@ -81,10 +81,13 @@ CFLAGS += $(USERCFLAGS) WARNINGS := -Wall +CFLAGS-GCOV := --coverage -fno-exceptions -fno-inline +export CFLAGS-GCOV + ifeq ($(GCOV),1) LDFLAGS += -lgcov DEBUG := 1 - CFLAGS += --coverage -fno-exceptions -fno-inline + CFLAGS += $(CFLAGS-GCOV) endif ifneq ($(WERROR),0) diff --git a/criu/arch/aarch64/Makefile.syscalls b/criu/arch/aarch64/Makefile.syscalls index 9b3b5387b..4fc185bf5 100644 --- a/criu/arch/aarch64/Makefile.syscalls +++ b/criu/arch/aarch64/Makefile.syscalls @@ -1,5 +1,7 @@ builtin-name := syscalls.built-in.o +CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS)) + SYS-TYPES := ../../include/syscall-types.h SYS-CODES := ../../include/syscall-codes.h SYS-PROTO := ../../include/syscall.h diff --git a/criu/arch/arm/Makefile.syscalls b/criu/arch/arm/Makefile.syscalls index 527960602..431d69005 100644 --- a/criu/arch/arm/Makefile.syscalls +++ b/criu/arch/arm/Makefile.syscalls @@ -1,5 +1,7 @@ builtin-name := syscalls.built-in.o +CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS)) + SYS-TYPES := ../../include/syscall-types.h SYS-CODES := ../../include/syscall-codes.h SYS-PROTO := ../../include/syscall.h diff --git a/criu/arch/ppc64/Makefile.syscalls b/criu/arch/ppc64/Makefile.syscalls index 1b28ce7dc..76e4caf72 100644 --- a/criu/arch/ppc64/Makefile.syscalls +++ b/criu/arch/ppc64/Makefile.syscalls @@ -1,5 +1,7 @@ builtin-name := syscalls.built-in.o +CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS)) + SYS-TYPES := ../../include/syscall-types.h SYS-CODES := ../../include/syscall-codes.h SYS-PROTO := ../../include/syscall.h diff --git a/criu/arch/x86/Makefile.syscalls b/criu/arch/x86/Makefile.syscalls index 99087842c..6c1a56af5 100644 --- a/criu/arch/x86/Makefile.syscalls +++ b/criu/arch/x86/Makefile.syscalls @@ -1,6 +1,8 @@ include $(__nmk_dir)msg.mk builtin-name := syscalls.built-in.o +CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS)) + SYS-TYPES := ../../include/syscall-types.h SYS-CODES := ../../include/syscall-codes.h SYS-PROTO := ../../include/syscall.h diff --git a/criu/pie/Makefile b/criu/pie/Makefile index 5197e1b2d..b455a02a6 100644 --- a/criu/pie/Makefile +++ b/criu/pie/Makefile @@ -15,7 +15,7 @@ restorer-obj-e += ./$(ARCH_DIR)/syscalls.built-in.o # applications, which is not the target of the # project. # -CFLAGS := $(filter-out -pg,$(CFLAGS)) -iquote pie/piegen -iquote arch/$(ARCH)/include -iquote $(SRC_DIR) -iquote $(SRC_DIR)/criu/include +CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS)) -iquote pie/piegen -iquote arch/$(ARCH)/include -iquote $(SRC_DIR) -iquote $(SRC_DIR)/criu/include ifneq ($(filter-out ia32,$(ARCH)),) ccflags-y += -DCR_NOGLIBC -fpie -Wa,--noexecstack -fno-stack-protector diff --git a/criu/pie/Makefile.library b/criu/pie/Makefile.library index b96d2f05b..e1a6acccf 100644 --- a/criu/pie/Makefile.library +++ b/criu/pie/Makefile.library @@ -29,7 +29,7 @@ endif # project. # iquotes := -iquote pie/piegen -iquote arch/$(ARCH)/include -iquote $(SRC_DIR) -iquote $(SRC_DIR)/criu/include -ccflags-y := $(filter-out -pg,$(CFLAGS)) $(iquotes) +CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS)) $(iquotes) asflags-y := -D__ASSEMBLY__ $(iquotes) ifeq ($(SRCARCH),arm)