| From 4eb1782eaa9fa1c224ad1fa0d13a9f09c3ab2d80 Mon Sep 17 00:00:00 2001 |
| From: Heiko Carstens <hca@linux.ibm.com> |
| Date: Thu, 23 Dec 2021 17:43:14 +0100 |
| Subject: recordmcount.pl: fix typo in s390 mcount regex |
| |
| From: Heiko Carstens <hca@linux.ibm.com> |
| |
| commit 4eb1782eaa9fa1c224ad1fa0d13a9f09c3ab2d80 upstream. |
| |
| Commit 85bf17b28f97 ("recordmcount.pl: look for jgnop instruction as well |
| as bcrl on s390") added a new alternative mnemonic for the existing brcl |
| instruction. This is required for the combination old gcc version (pre 9.0) |
| and binutils since version 2.37. |
| However at the same time this commit introduced a typo, replacing brcl with |
| bcrl. As a result no mcount locations are detected anymore with old gcc |
| versions (pre 9.0) and binutils before version 2.37. |
| Fix this by using the correct mnemonic again. |
| |
| Reported-by: Miroslav Benes <mbenes@suse.cz> |
| Cc: Jerome Marchand <jmarchan@redhat.com> |
| Cc: <stable@vger.kernel.org> |
| Fixes: 85bf17b28f97 ("recordmcount.pl: look for jgnop instruction as well as bcrl on s390") |
| Link: https://lore.kernel.org/r/alpine.LSU.2.21.2112230949520.19849@pobox.suse.cz |
| Signed-off-by: Heiko Carstens <hca@linux.ibm.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| scripts/recordmcount.pl | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/scripts/recordmcount.pl |
| +++ b/scripts/recordmcount.pl |
| @@ -252,7 +252,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*(bcrl\\s*0,|jgnop\\s*)[0-9a-f]+ <([^\+]*)>\$"; |
| + $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*c0 04 00 00 00 00\\s*(brcl\\s*0,|jgnop\\s*)[0-9a-f]+ <([^\+]*)>\$"; |
| $mcount_adjust = 0; |
| } else { |
| $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*R_390_(PC|PLT)32DBL\\s+_mcount\\+0x2\$"; |
