Hi Andrew,
Andrew Cooper <andrew.coop...@citrix.com> writes: > On 27/03/2025 10:03 pm, Volodymyr Babchuk wrote: >> Hi Jan, >> >> Jan Beulich <jbeul...@suse.com> writes: >> >>> On 27.03.2025 01:40, Volodymyr Babchuk wrote: >>>> GCC 14.1 has 9 gcov counters and also can call new merge function >>>> __gcov_merge_ior(), so we need a new stub for it. >>>> >>>> Signed-off-by: Volodymyr Babchuk <volodymyr_babc...@epam.com> >>> As to the title - what about 14.2.0? Or the soon to appear 14.3.0? I >>> recommend >>> to say just 14. >>> >> According to GCC changelog, it was added in GCC 14.1. And yesterday they >> added another counter... So probably 14.3 will have 10 counters in total. > > Do you have links? Here is the patch that added a new counter: https://github.com/gcc-mirror/gcc/commit/8ed2d5d219e999aee42015a0db38612011c2c507 > I'd expect that to mean that GCC 15 will have 10 counters, not GCC 14.3. > I can't say for sure, of course. Anyways, it is not released yet so no sense in trying to cover it in this patches. >>>> --- a/xen/common/coverage/gcc_4_7.c >>>> +++ b/xen/common/coverage/gcc_4_7.c >>>> @@ -28,8 +28,10 @@ >>>> #define GCOV_COUNTERS 10 >>>> #elif GCC_VERSION < 100000 >>>> #define GCOV_COUNTERS 9 >>>> -#else >>>> +#elif GCC_VERSION < 140100 >>> The situation is a little less clear here because the development window is >>> fuzzy to cover. Nevertheless with all other conditionals here using only a >>> major version, with subversion being 0, I think the same should go for 14. >>> Unless of course there is a good reason to be inconsistent. >> As I said, 9nth counter was added in GCC 14.1, GCC 14.0 had less counters. > > In GCC's numbering scheme, .0 is the dev window and .1 is the release. > > The 9th counter will have appeared somewhere in the dev window, but > that's all GCC 14 as far as we're concerned. Ah, okay, thanks. I'll rework the patch to check for major version only. -- WBR, Volodymyr
