On 2017-02-28 15:42, Henning Schild wrote: > Am Tue, 28 Feb 2017 15:24:17 +0100 > schrieb Jan Kiszka <[email protected]>: > >> On 2017-02-28 14:54, Henning Schild wrote: >>> Am Tue, 28 Feb 2017 10:10:50 +0100 >>> schrieb Jan Kiszka <[email protected]>: >>> >>>> On 2017-02-27 16:40, Henning Schild wrote: >>>>> If the root-cell kernel is built with GCOV >>>>> (CONFIG_GCOV_PROFILE_ALL) kbuild will build everything with GCOV >>>>> support. For the driver it is ok to inherit that, but for out of >>>>> kernel parts like hypervisor, tools, inmates it is not. >>>>> >>>>> Signed-off-by: Henning Schild <[email protected]> >>>>> >>>>> diff --git a/configs/Makefile b/configs/Makefile >>>>> --- a/configs/Makefile >>>>> +++ b/configs/Makefile >>>>> @@ -22,6 +22,8 @@ >>>>> >>>>> OBJCOPYFLAGS := -O binary >>>>> >>>>> +GCOV_PROFILE := n >>>>> + >>>>> CONFIGS = $(shell cd $(src); ls *.c) >>>>> >>>>> always := $(CONFIGS:.c=.cell) >>>>> diff --git a/hypervisor/Makefile b/hypervisor/Makefile >>>>> --- a/hypervisor/Makefile >>>>> +++ b/hypervisor/Makefile >>>>> @@ -30,6 +30,8 @@ >>>>> KBUILD_CFLAGS += -include $(obj)/include/jailhouse/config.h >>>>> endif >>>>> >>>>> +GCOV_PROFILE := n >>>>> + >>>>> CORE_OBJECTS = setup.o printk.o paging.o control.o lib.o mmio.o >>>>> pci.o ivshmem.o >>>>> define filechk_config_mk >>>>> diff --git a/hypervisor/arch/arm-common/Kbuild >>>>> b/hypervisor/arch/arm-common/Kbuild --- >>>>> a/hypervisor/arch/arm-common/Kbuild +++ >>>>> b/hypervisor/arch/arm-common/Kbuild @@ -12,6 +12,8 @@ >>>>> >>>>> include $(CONFIG_MK) >>>>> >>>>> +GCOV_PROFILE := n >>>>> + >>>>> OBJS-y += dbg-write.o lib.o psci.o control.o paging.o mmu_cell.o >>>>> OBJS-y += irqchip.o pci.o ivshmem.o uart-pl011.o uart-8250.o >>>>> uart-xuartps.o OBJS-$(CONFIG_ARM_GIC_V2) += gic-v2.o >>>>> diff --git a/hypervisor/arch/x86/Kbuild >>>>> b/hypervisor/arch/x86/Kbuild --- a/hypervisor/arch/x86/Kbuild >>>>> +++ b/hypervisor/arch/x86/Kbuild >>>>> @@ -12,6 +12,8 @@ >>>>> # the COPYING file in the top-level directory. >>>>> # >>>>> >>>>> +GCOV_PROFILE := n >>>>> + >>>>> BUILT_IN_OBJECTS := built-in-amd.o built-in-intel.o >>>>> COMMON_OBJECTS := apic.o dbg-write.o entry.o setup.o control.o >>>>> mmio.o iommu.o \ paging.o pci.o ioapic.o i8042.o vcpu.o uart.o >>>>> vga.o ivshmem.o diff --git a/inmates/lib/arm-common/Makefile.lib >>>>> b/inmates/lib/arm-common/Makefile.lib --- >>>>> a/inmates/lib/arm-common/Makefile.lib +++ >>>>> b/inmates/lib/arm-common/Makefile.lib @@ -10,6 +10,8 @@ >>>>> # the COPYING file in the top-level directory. >>>>> # >>>>> >>>>> +GCOV_PROFILE := n >>>>> + >>>>> OBJS-y := ../string.o ../cmdline.o >>>>> OBJS-y += printk.o gic.o timer.o >>>>> OBJS-y += uart-jailhouse.o uart-pl011.o uart-8250.o >>>>> uart-xuartps.o diff --git a/inmates/lib/x86/Makefile.lib >>>>> b/inmates/lib/x86/Makefile.lib --- a/inmates/lib/x86/Makefile.lib >>>>> +++ b/inmates/lib/x86/Makefile.lib >>>>> @@ -11,6 +11,7 @@ >>>>> # >>>>> >>>>> KBUILD_CFLAGS += -m64 >>>>> +GCOV_PROFILE := n >>>>> >>>>> define DECLARE_TARGETS = >>>>> _TARGETS = $(1) >>>>> diff --git a/tools/Makefile b/tools/Makefile >>>>> --- a/tools/Makefile >>>>> +++ b/tools/Makefile >>>>> @@ -20,6 +20,7 @@ >>>>> -Wall -Wextra -Wmissing-declarations -Wmissing-prototypes >>>>> -Werror \ -DJAILHOUSE_VERSION=\"$(shell cat $(src)/../VERSION)\" >>>>> $(EXTRA_CFLAGS) LDFLAGS := >>>>> +GCOV_PROFILE := n >>>>> >>>>> BINARIES := jailhouse >>>>> HELPERS := \ >>>>> >>>> >>>> Deja vu: I've already merged e55278895aad (but didn't push next so >>>> far, sorry). Is this just the same? >>> >>> Yes it is the same. But Patch 2 is actually required to make that >>> one work for x86 inmate code. So logically Patch 2 should go in >>> before this one. >> >> Please tell me what shall be done to next (pull out a patch again?) or >> simply base your v2 on top of it. > > review 2/10 from this series > > apply it before the already accepted "make: do not support GCOV in out > of kernel components …" (currently e55278895aadf2d) in next > > Doing that will be like applying 1-3 from this series because 1 and 3 > are already in next and 2 was missing. Sorry for the confusion.
Patch 2 is fine. Will squeeze it before the corresponding commit to this patch in next. Jan -- Siemens AG, Corporate Technology, CT RDA ITP SES-DE Corporate Competence Center Embedded Linux -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
