From nobody Sun Sep 24 16:19:22 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rtrmq0fBGz4v8th; Sun, 24 Sep 2023 16:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rtrmp73t0z3PT8; Sun, 24 Sep 2023 16:19:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695572363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3/ERNWDo22SLkkW/3nm50MLGS81d5Uvkjuej4rjnCmY=; b=Iyuu0KlCEeMe87EIQK4+9pyqFZGIcj4kaP4qmDQX0YIoPaF6na7TI+32ZUZJlnG/33GG2/ o1fA90b0K42SVFUvHwwK45ElT+Wj2q7lqfKU0HNBlYWRY4KaRuFNygFWi8br2Jb9UI5ajT Lb1XdnOzVUoNfg1pi6rKaHiMGPuOtGrexWbMT4Ms6eIlvJc5/W4h/RamLjd5/TZG9XzZZN 5L1FpcmB8hLbgcLMpTHWFZ55VmEmuF6OivZ9mzP7Eu38ZEnI4Mc8wkc7wzZkh711KxLhUe eecVynCdK5CkHqUD5/R+xv19Xtw76tqY5YsNDD3iUHhaF/QBHTNJwyXyNqMhBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695572363; a=rsa-sha256; cv=none; b=tdEv4GZkSy7MpMVZx+MQlC9bRAI5BpsYjQjKFDSUlisq4p9AkdOSZrYDXmwHpdI9/41H7l w0NmU1ea4qfKxJE0rqzAWECF1aZu+QeZL74g2E74GprpampshfF03PLnr8x7Qvrc2jOI4T Z1MxnC42oAuiuJhea/vi4zACLEgSZmmkE8VbeMnEXDF3mAh+xdbav0aNh4Bjn+F6nUfj+7 1v5OibNATjoHv2rwqgFNoPH0qE+iTiKjspTErBo3SCvVEa0uhr0adPcGBlx4z9BdjtF+UG 63jcYFGUICbP3ZHa/1s04HhgppfzaZfriwd7imGlQQiZVhW/9BC5TFce+u1LXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695572363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3/ERNWDo22SLkkW/3nm50MLGS81d5Uvkjuej4rjnCmY=; b=dRWkhMuX6zRvc+/JXkTnkB7wUNwWKahTiGdpnvWwU99hMa4LgbdYtR8HXZ84C9CmZa8fll KPArM83wMnKWBz/CMSQ1zVvCPsW5ICOhBWi8kPqwEm/ezDjObjnVqfMfcKd7ErUo4yJy1M Nmv+tlMuR+6js/wHYxwHdByoNC4MlzZ5wGSI5eb966yHkcI1q9oT5nkhy3xem8FA6zDUo5 MKdj/XF8H4y2TKPY4UYqD5G8N36TR2pwjo2ksOL17PXkU3xPnNJnSpIVR7cwnzzW8SiJvu P9LXIQ9jSELOpQA0DEFMsyC5VeLIn2ubk3j4oYPckTeuI7XNk0yBlCEuk08iZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rtrmp67JNztZy; Sun, 24 Sep 2023 16:19:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38OGJMac079298; Sun, 24 Sep 2023 16:19:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38OGJMs6079295; Sun, 24 Sep 2023 16:19:22 GMT (envelope-from git) Date: Sun, 24 Sep 2023 16:19:22 GMT Message-Id: <202309241619.38OGJMs6079295@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: cd8cd03403cc - releng/14.0 - OpenSSL: Fix handling of the "0:" label in arm-xlate.pl List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: cd8cd03403cc74f4e55dbc9f55ff0271a5b0a2d0 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cd8cd03403cc74f4e55dbc9f55ff0271a5b0a2d0 commit cd8cd03403cc74f4e55dbc9f55ff0271a5b0a2d0 Author: Tom Cosgrove AuthorDate: 2023-08-29 21:38:11 +0000 Commit: Ed Maste CommitDate: 2023-09-24 16:18:09 +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) (cherry picked from commit e99406a2bb3234e2a05eef5e63be3054ffac3371) Approved by: re (gjb) --- 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); } }