git: e99406a2bb32 - stable/14 - OpenSSL: Fix handling of the "0:" label in arm-xlate.pl
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 22 Sep 2023 19:07:58 UTC
The branch stable/14 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=e99406a2bb3234e2a05eef5e63be3054ffac3371
commit e99406a2bb3234e2a05eef5e63be3054ffac3371
Author: Tom Cosgrove <tom.cosgrove@arm.com>
AuthorDate: 2023-08-29 21:38:11 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-09-22 19:06:35 +0000
OpenSSL: Fix handling of the "0:" label in arm-xlate.pl
When $label == "0", $label is not truthy, so `if ($label)` thinks there isn't
a label. Correct this by looking at the result of the s/// command.
Verified that there are no changes in the .S files created during a normal
build, and that the "0:" labels appear in the translation given in the error
report (and they are the only difference in the before and after output).
Obtained from: OpenSSL commit 9607f5ccf285ac9988a86f95c5ad9f92b556a843
Reviewed by: markj
Differential Revision: https://reviews.freebsd.org/D41587
(cherry picked from commit eba6abafc1988dc8753b08822abff333d4810e75)
---
crypto/openssl/crypto/perlasm/arm-xlate.pl | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/crypto/openssl/crypto/perlasm/arm-xlate.pl b/crypto/openssl/crypto/perlasm/arm-xlate.pl
index a90885905c0f..57b75c4e5dad 100755
--- a/crypto/openssl/crypto/perlasm/arm-xlate.pl
+++ b/crypto/openssl/crypto/perlasm/arm-xlate.pl
@@ -159,9 +159,8 @@ while(my $line=<>) {
}
{
- $line =~ s|(^[\.\w]+)\:\s*||;
- my $label = $1;
- if ($label) {
+ if ($line =~ s|(^[\.\w]+)\:\s*||) {
+ my $label = $1;
printf "%s:",($GLOBALS{$label} or $label);
}
}