From nobody Mon Mar 28 14:15:59 2022 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 A4C651A480E8; Mon, 28 Mar 2022 14:15:59 +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 4KRvqz42qzz3BpX; Mon, 28 Mar 2022 14:15:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648476959; 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=gn5zyDDenHEPmm/Uq1RQofxdJVP0Y9HQXVqrjy29WX4=; b=W1pfCcHTlQ7N20hoXTnBLoZovTS+o5FxYgn/ynWY6aDXcUMlrh35RO4hpHMqTa5QH5L52N XWciy/JS3iwVVEigRdOIZ89swaxZAQCPT+0bc+RMZCVCAoHjEhsA8QwO7p8WaJk6NrjXVz 01JA8RgIsTx25sPI03EaJ6MXZU5p/iZRDqTBH9yzrQNsN8sYmRm3ejSshZ6qijb15W+4oh DBuRuN7YsP1YmTimiDE3/C0yA+B6qO3uQsOgATZu8p55NioDaBW2A5pQQ04hNFv3cqCfyb 8Q7mYa1FxiCOCD+7CSswHaspo15RQysNSj7MuNlHC1xZA/fgpyNdMHWtXbzHKA== 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 674D2303B; Mon, 28 Mar 2022 14:15:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22SEFxDq092258; Mon, 28 Mar 2022 14:15:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22SEFxHx092257; Mon, 28 Mar 2022 14:15:59 GMT (envelope-from git) Date: Mon, 28 Mar 2022 14:15:59 GMT Message-Id: <202203281415.22SEFxHx092257@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Piotr Kubaj Subject: git: bf2378688d27 - releng/13.1 - Merge LLVM commit c03fdd340356 to fix lang/rust on powerpc 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: pkubaj X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: bf2378688d276903dc63437758af7962dad2ccd5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648476959; 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=gn5zyDDenHEPmm/Uq1RQofxdJVP0Y9HQXVqrjy29WX4=; b=aqiW/4YGA2z3KOelLXOzyeU6Tsxmd+D2NwcX1yHSdl0oSxXzHeqPgBjO6EFV86Q/w46WMd sgh4a7p9qFlxp653RspBr6nIT8dC3lXS1MaxlsOX/4JNvuuST1XTnrTJtVyrTNjtEhlW9g OCDF+F/LnoHXxBcJYSUW7Rr0ICDRBWL2uKrSy/JDtc733zL7nG7E4llEiNB8vkoPjb4nrm oYvk5Ca7tkgubn4ECmUwmHfT279xHvVAaxL9Yuw3N9k5h4aNAn9tXGJJqht3EN+slrNsRl zFrC+r9/GjYaeiskkZ29on7X21/zjFjk5fGl/LaC+wgPnRojfcatXGw7qa3KYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648476959; a=rsa-sha256; cv=none; b=x8O1u6kb0YdoGkDdHGHNxpxWUc4qXE3tZ/RWdzSBm7bcnDCPi0xDAc/GBF9rRu7+/h/G3l nHEHeX4j6wW7rZ0aR2yciOrUuf73KPbxu+GZDD38b0fi0/jdZcvU8f3cRyXWtWP3Yy5s76 Z711yObEn0OFeVviZrGZrpfvdjR2cgWoymDYzeYW9RB+h3cF6T+HLlQLeF43NEgj+OT7sd giFELZTKANm+1kn6FDmi8WjeHXeBUWw/WXaHa9fIZcJ7s4BW+KO7rCGaU04E/3j2x7bNAr yzKObLnlo87iT3h75CgIDqI2o+eXtXf9X/IHo9AQwuSEzNBfiymYc1WOAbJNxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by pkubaj (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=bf2378688d276903dc63437758af7962dad2ccd5 commit bf2378688d276903dc63437758af7962dad2ccd5 Author: Piotr Kubaj AuthorDate: 2022-03-24 00:30:44 +0000 Commit: Piotr Kubaj CommitDate: 2022-03-28 14:15:32 +0000 Merge LLVM commit c03fdd340356 to fix lang/rust on powerpc Without it building rust fails with: ld: error: CallSiteSplitting.cpp:(function llvm::SmallVectorImpl, 2u> > >::operator=(llvm::SmallVectorImpl, 2u> > >&&): .text._ZN4llvm15SmallVectorImplINSt3__14pairIPNS_10BasicBlockENS_11SmallVectorINS2_IPNS_8ICmpInstEjEELj2EEEEEEaSEOSB_+0xB0): relocation R_PPC_PLTREL24 out of range: -33582208 is not in [-33554432, 33554431] Reviewed by: dim Approved by: re (gjb) Differential Revision: https://reviews.freebsd.org/D34652 MFC after: 3 days (cherry picked from commit 9b597132aea7d75810ca90258022f81d07971444) (cherry picked from commit 56a4f560d429188625de4075983ec380bf8f7057) --- contrib/llvm-project/lld/ELF/Relocations.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/lld/ELF/Relocations.cpp b/contrib/llvm-project/lld/ELF/Relocations.cpp index 537859f9e0b5..eb3d115266a6 100644 --- a/contrib/llvm-project/lld/ELF/Relocations.cpp +++ b/contrib/llvm-project/lld/ELF/Relocations.cpp @@ -1966,7 +1966,8 @@ std::pair ThunkCreator::getThunk(InputSection *isec, // out in the relocation addend. We compensate for the PC bias so that // an Arm and Thumb relocation to the same destination get the same keyAddend, // which is usually 0. - int64_t keyAddend = rel.addend + getPCBias(rel.type); + const int64_t pcBias = getPCBias(rel.type); + const int64_t keyAddend = rel.addend + pcBias; // We use a ((section, offset), addend) pair to find the thunk position if // possible so that we create only one thunk for aliased symbols or ICFed @@ -1985,7 +1986,7 @@ std::pair ThunkCreator::getThunk(InputSection *isec, if (isThunkSectionCompatible(isec, t->getThunkTargetSym()->section) && t->isCompatibleWith(*isec, rel) && target->inBranchRange(rel.type, src, - t->getThunkTargetSym()->getVA(rel.addend))) + t->getThunkTargetSym()->getVA(-pcBias))) return std::make_pair(t, false); // No existing compatible Thunk in range, create a new one