Commit 2fd16c39 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Pavel Emelyanov

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: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent b7f0af3a
...@@ -81,10 +81,13 @@ CFLAGS += $(USERCFLAGS) ...@@ -81,10 +81,13 @@ CFLAGS += $(USERCFLAGS)
WARNINGS := -Wall WARNINGS := -Wall
CFLAGS-GCOV := --coverage -fno-exceptions -fno-inline
export CFLAGS-GCOV
ifeq ($(GCOV),1) ifeq ($(GCOV),1)
LDFLAGS += -lgcov LDFLAGS += -lgcov
DEBUG := 1 DEBUG := 1
CFLAGS += --coverage -fno-exceptions -fno-inline CFLAGS += $(CFLAGS-GCOV)
endif endif
ifneq ($(WERROR),0) ifneq ($(WERROR),0)
......
builtin-name := syscalls.built-in.o builtin-name := syscalls.built-in.o
CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS))
SYS-TYPES := ../../include/syscall-types.h SYS-TYPES := ../../include/syscall-types.h
SYS-CODES := ../../include/syscall-codes.h SYS-CODES := ../../include/syscall-codes.h
SYS-PROTO := ../../include/syscall.h SYS-PROTO := ../../include/syscall.h
......
builtin-name := syscalls.built-in.o builtin-name := syscalls.built-in.o
CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS))
SYS-TYPES := ../../include/syscall-types.h SYS-TYPES := ../../include/syscall-types.h
SYS-CODES := ../../include/syscall-codes.h SYS-CODES := ../../include/syscall-codes.h
SYS-PROTO := ../../include/syscall.h SYS-PROTO := ../../include/syscall.h
......
builtin-name := syscalls.built-in.o builtin-name := syscalls.built-in.o
CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS))
SYS-TYPES := ../../include/syscall-types.h SYS-TYPES := ../../include/syscall-types.h
SYS-CODES := ../../include/syscall-codes.h SYS-CODES := ../../include/syscall-codes.h
SYS-PROTO := ../../include/syscall.h SYS-PROTO := ../../include/syscall.h
......
include $(__nmk_dir)msg.mk include $(__nmk_dir)msg.mk
builtin-name := syscalls.built-in.o builtin-name := syscalls.built-in.o
CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS))
SYS-TYPES := ../../include/syscall-types.h SYS-TYPES := ../../include/syscall-types.h
SYS-CODES := ../../include/syscall-codes.h SYS-CODES := ../../include/syscall-codes.h
SYS-PROTO := ../../include/syscall.h SYS-PROTO := ../../include/syscall.h
......
...@@ -15,7 +15,7 @@ restorer-obj-e += ./$(ARCH_DIR)/syscalls.built-in.o ...@@ -15,7 +15,7 @@ restorer-obj-e += ./$(ARCH_DIR)/syscalls.built-in.o
# applications, which is not the target of the # applications, which is not the target of the
# project. # 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)),) ifneq ($(filter-out ia32,$(ARCH)),)
ccflags-y += -DCR_NOGLIBC -fpie -Wa,--noexecstack -fno-stack-protector ccflags-y += -DCR_NOGLIBC -fpie -Wa,--noexecstack -fno-stack-protector
......
...@@ -29,7 +29,7 @@ endif ...@@ -29,7 +29,7 @@ endif
# project. # project.
# #
iquotes := -iquote pie/piegen -iquote arch/$(ARCH)/include -iquote $(SRC_DIR) -iquote $(SRC_DIR)/criu/include 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) asflags-y := -D__ASSEMBLY__ $(iquotes)
ifeq ($(SRCARCH),arm) ifeq ($(SRCARCH),arm)
......
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