From nobody Thu Mar 24 08:06:16 2022 X-Original-To: dev-commits-src-main@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 CDC761A3C862; Thu, 24 Mar 2022 08:06:16 +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 4KPHqD5Pfzz3vvs; Thu, 24 Mar 2022 08:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648109176; 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=9qS//7orbunQpse7QBuVaZA+B3W3BlLaGQP1fs4SlgQ=; b=JzjZHCo6w1nREbbVJHaOlhzTeAqs+IIia8VehWWVW8Y6LUIWyJaOprotxfoj3I3iQGjvi+ Mp5EazwwJT+cRMIK7TVustKE52bixTRQQIIxcpzkmnm9Sakv2elUepURBwTGVWCAJW0iim A9UMZVyTELGuy+2sHCQ+xBMrnO2plAhdKMBUbkCM4NXV38FJLzrRP2q9/xQSS/Zh+grQ7w +xNRL3Uw1nO7If4VMGvGNR8fCVuCqQkwBTUnrX8taZC1jiIzoSiNvH1gNv+mUWyJ2mFACO v/QAw01EEzlTRc3UD7Jjggp0sae450LwMXJufx6fSrMtRSS51SV86xWiuJ4bIw== 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 992D413FD6; Thu, 24 Mar 2022 08:06:16 +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 22O86GEY016212; Thu, 24 Mar 2022 08:06:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22O86GRc016211; Thu, 24 Mar 2022 08:06:16 GMT (envelope-from git) Date: Thu, 24 Mar 2022 08:06:16 GMT Message-Id: <202203240806.22O86GRc016211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Kubaj Subject: git: 9b597132aea7 - main - Merge LLVM commit c03fdd340356 to fix lang/rust on powerpc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 9b597132aea7d75810ca90258022f81d07971444 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648109176; 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=9qS//7orbunQpse7QBuVaZA+B3W3BlLaGQP1fs4SlgQ=; b=BZtZId+alGTCx2a18W2jOJJ3IwB0JqquRK8l/nqjgbusBbPAPNwAoo6zoh1fT7yFdwqnTA uZ37hCJj6LsvFnAKHnvOwtEwqQyNrqA8EdezyiqB5I6erAet31yKRtrDbBgnJQgsNJlFHt hmpAvvoY42aWH2X0oWIE6rpfnnunZKD8jLP0idPZRmKVHdRUy0uYynpztDYkzFngeaGej3 776XMZhjslrXnmAJzAiPT4fys1v6DYM3WaLSKi1xxLTTVDQD+SU1xrOGmyP92+0MMiPiCb SNmweLGk9ydhyEHFH1pmx5laKQbxFxygmb+Trl/pR+cBHCOifLKpQI9meZ7r8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648109176; a=rsa-sha256; cv=none; b=bElF4uy/vfa5PlQBNkncb6apsUEVtkc5utL0esSpB6rfublZR5zEGHksC9+c9Oz7aFx1Md h2ypK+O5CIC1FdFVHB0UqEo57KLL9OAR3MBZavpga/DulHvYd2FHfRooy7S5tt34XeLxG3 aU3PbjOW7Nuo765ASg5NoVINUVHnw9hMRN3c/ugh24htq9nwU/uVx/2/a88A4wGdn2Ek4x DCtIB1rFzrDWUQZY1ntyRYH4XznM/zchEx2yWsUTGKaoJkyplI4Hmfpm8RHmKiEYfvdBTr FbHy+Jksb9bQu1x837Eo5SXnd9RUHrE3Hs5xwBwzIvZc/RwsdTPFoYFzXNr2uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=9b597132aea7d75810ca90258022f81d07971444 commit 9b597132aea7d75810ca90258022f81d07971444 Author: Piotr Kubaj AuthorDate: 2022-03-24 00:30:44 +0000 Commit: Piotr Kubaj CommitDate: 2022-03-24 08:06:12 +0000 Merge LLVM commit c03fdd340356 to fix lang/rust on powerpc Summary: 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] This will need to be merged to releng/13.1. Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D34652 MFC after: 3 days --- 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