Re: [PATCH] recordmcount.pl: look for jgnop instruction as well as bcrl on s390

From: Heiko Carstens
Date: Thu Dec 23 2021 - 12:40:49 EST


> > On s390, recordmcount.pl is looking for "bcrl 0,<xxx>" instructions in
> > the objdump -d outpout. However since binutils 2.37, objdump -d
> > display "jgnop <xxx>" for the same instruction. Update the
> > mcount_regex so that it accepts both.
> >
> > Signed-off-by: Jerome Marchand <jmarchan@xxxxxxxxxx>
> > ---
> > scripts/recordmcount.pl | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
> > index 7d631aaa0ae1..52a000b057a5 100755
> > --- a/scripts/recordmcount.pl
> > +++ b/scripts/recordmcount.pl
> > @@ -219,7 +219,7 @@ if ($arch eq "x86_64") {
> >
> > } elsif ($arch eq "s390" && $bits == 64) {
> > if ($cc =~ /-DCC_USING_HOTPATCH/) {
> > - $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*c0 04 00 00 00 00\\s*brcl\\s*0,[0-9a-f]+ <([^\+]*)>\$";
> > + $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*c0 04 00 00 00 00\\s*(bcrl\\s*0,|jgnop\\s*)[0-9a-f]+ <([^\+]*)>\$";
>
> there is a typo I did not notice before. Sorry about that *sigh*.
>
> s/bcrl/brcl/ on the whole patch.

Hm.. nice. So I will schedule the patch below for next week. Actually
tested with the variants I mentioned in the commit message.