summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorHeiko Carstens <hca@linux.ibm.com>2021-12-23 17:43:14 +0100
committerHeiko Carstens <hca@linux.ibm.com>2021-12-24 10:20:12 +0100
commit4eb1782eaa9fa1c224ad1fa0d13a9f09c3ab2d80 (patch)
tree014d14d3107df34bc9805e75fc324cef8afc6de7 /scripts
parent85bf17b28f97ca2749968d8786dc423db320d9c2 (diff)
downloadlinux-4eb1782eaa9fa1c224ad1fa0d13a9f09c3ab2d80.tar.gz
linux-4eb1782eaa9fa1c224ad1fa0d13a9f09c3ab2d80.tar.bz2
linux-4eb1782eaa9fa1c224ad1fa0d13a9f09c3ab2d80.zip
recordmcount.pl: fix typo in s390 mcount regex
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>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/recordmcount.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index 52a000b057a5..3ccb2c70add4 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*(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;
}
$alignment = 8;