Skip to content

Commit 4eb1782

Browse files
committed
recordmcount.pl: fix typo in s390 mcount regex
Commit 85bf17b ("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 <[email protected]> Cc: Jerome Marchand <[email protected]> Cc: <[email protected]> Fixes: 85bf17b ("recordmcount.pl: look for jgnop instruction as well as bcrl on s390") Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Heiko Carstens <[email protected]>
1 parent 85bf17b commit 4eb1782

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

scripts/recordmcount.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219

220220
} elsif ($arch eq "s390" && $bits == 64) {
221221
if ($cc =~ /-DCC_USING_HOTPATCH/) {
222-
$mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*c0 04 00 00 00 00\\s*(bcrl\\s*0,|jgnop\\s*)[0-9a-f]+ <([^\+]*)>\$";
222+
$mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*c0 04 00 00 00 00\\s*(brcl\\s*0,|jgnop\\s*)[0-9a-f]+ <([^\+]*)>\$";
223223
$mcount_adjust = 0;
224224
}
225225
$alignment = 8;

0 commit comments

Comments
 (0)