Re: [Xen-devel] [PATCH v2 for-next 6/9] kconfig/gcov: rename to coverage

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 09.11.17 at 12:13, <roger.pau@xxxxxxxxxx> wrote:
> --- a/xen/Rules.mk
> +++ b/xen/Rules.mk
> @@ -115,9 +115,13 @@ subdir-all := $(subdir-y) $(subdir-n)
>  
>  $(filter %.init.o,$(obj-y) $(obj-bin-y) $(extra-y)): CFLAGS += 
> -DINIT_SECTIONS_ONLY
>  
> -ifeq ($(CONFIG_GCOV),y)
> +ifeq ($(CONFIG_COVERAGE),y)
> +ifeq ($(clang),y)
> +$(filter-out %.init.o $(nogcov-y),$(obj-y) $(obj-bin-y) $(extra-y)): CFLAGS 
> += -fprofile-instr-generate -fcoverage-mapping
> +else
>  $(filter-out %.init.o $(nogcov-y),$(obj-y) $(obj-bin-y) $(extra-y)): CFLAGS 
> += -fprofile-arcs -ftest-coverage

Could you please eliminate the redundancy here? Use a helper variable
to hold the options to add, and then have just a single line with the
$(filter-out ...):.

> --- a/xen/common/coverage/Makefile
> +++ b/xen/common/coverage/Makefile
> @@ -1,6 +1,9 @@
> -obj-y += coverage.o gcov_base.o gcov.o
> +obj-y += coverage.o
> +ifneq ($(clang),y)
> +obj-y += gcov_base.o gcov.o
>  obj-y += $(call cc-ifversion,lt,0x040700, \
>               gcc_3_4.o, $(call cc-ifversion,lt,0x040900, \
>               gcc_4_7.o, $(call cc-ifversion,lt,0x050000, \
>               gcc_4_9.o, $(call cc-ifversion,lt,0x070000, \
>               gcc_5.o, gcc_7.o))))
> +endif

I guess the build with clang is broken before and after this patch
when the Kconfig option is enabled, in which case the ordering
within the series doesn't matter. Otherwise I would have said
that this patch should come after the one adding the LLVM files.

Jan


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel