From nobody Tue Aug 29 21:47:20 2023 X-Original-To: dev-commits-src-all@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 4Rb1HD229Rz4rFxS; Tue, 29 Aug 2023 21:47:20 +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 4Rb1HD1Xhvz3KD1; Tue, 29 Aug 2023 21:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693345640; 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=1boI6/Dti3GcY2X10sK8SewSNfkc7c3EmnKEFWh6ZUQ=; b=v6dj2vNcJ51iKvyLIFWFrpGDYjE21PbPr693tIVQd+cxMAXovNIzdgkK2P5t9DpfjN4kJm cqustNnKAhyK+r3Fx4LyVq76tZIojy+bgjWeHDfuMt53edFG4zlEEZKKElOtgT7ecQVLvz uRIq4QBQioTd6PPKQNCyukxTXwYBAjdSPRHKcCCYAN0DXAFdCAIKKX2nBPTM6+zbNq28qv qWhFQaGYJsPTtvGa00YhMznTOeFjNjlEKTYXzQqpjob+F5TpsuU91S8DmfdHG7J4ApSN52 me0gF/5PbHF3yZd8VEEYhZQf14nSQQKPMCopVm7trS32hEbuoe4BlqCMSMioNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693345640; a=rsa-sha256; cv=none; b=FCem5u88u14T3ZjGFsOIiOwV2DvtkChQ/Rv2lNGqfxIXI9WD3LneTEwnBTPHfrP789/mLm X0k4nUp31Gejx8YHBOmS8XVUqEg+Vc5d77apqIuxmeBOy3gkEEINmNMQCL9TGQCZlI7gQb Xw2MX1I9ID/+X2+2vJg14bu9f3y2xFdf3Dax28tZa1gobftv4q33UHObfP/WCcJ230ClAu JnDjcOkOootXp8PEoP/12ktFwmPDfAsfw6J3wDQU+aSbhXBLh3qq7W5HVI6kg3m8Q/7APm iHEZ1ScWDgpqU9zr0gHuqjaIEBuGwSwJliGlOjjRPec7MwHz/zF211EFM11pYQ== 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=1693345640; 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=1boI6/Dti3GcY2X10sK8SewSNfkc7c3EmnKEFWh6ZUQ=; b=dyqjYFgMM9llhwgzn1fgP1g7Lo0v0C996xbGmJ/qPnDHMYBgMk7vFe6p90wDSH7SCT3Lnt SbZX8mZCD8lDpL69jBKuAl8MB5mGd9fN2Ibtap50m6LsSFfU2neaHVe+YGZGJTIZX/6XJI lsBia/YbImKQGXOtAhtqql9WLEqsCP7CkUFvwboXz6fx/x9LwRy4pe8thsPbUcDmeg6uAm BtKs+STshYmiT7vaEhWwidOLCUHq5kTuwbtMfzVfbhf/+3ixScdDgk//e0AOFBOmcsl/iz z2JdDBRaBlDRBcaZFjp+nIrPb9YhtCpgGRlp4Jf1zBpz3sSs/DZAWnBS7me5ig== 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 4Rb1HD0cBfz17hY; Tue, 29 Aug 2023 21:47:20 +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 37TLlKQW087542; Tue, 29 Aug 2023 21:47:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37TLlKHc087539; Tue, 29 Aug 2023 21:47:20 GMT (envelope-from git) Date: Tue, 29 Aug 2023 21:47:20 GMT Message-Id: <202308292147.37TLlKHc087539@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: eba6abafc198 - main - OpenSSL: Fix handling of the "0:" label in arm-xlate.pl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eba6abafc1988dc8753b08822abff333d4810e75 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=eba6abafc1988dc8753b08822abff333d4810e75 commit eba6abafc1988dc8753b08822abff333d4810e75 Author: Tom Cosgrove AuthorDate: 2023-08-29 21:38:11 +0000 Commit: John Baldwin CommitDate: 2023-08-29 21:38:11 +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 --- 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); } }