From nobody Mon Jul 27 16:56:02 2026 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 4h84Vb5CH8z6nFFK for ; Mon, 27 Jul 2026 16:56:07 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h84Vb42Xvz3C3y for ; Mon, 27 Jul 2026 16:56:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785171367; 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=R8w/ulg012nOUatCfZlXQLCcwZlCZ775ADhb4r/JJ1o=; b=coxVOw7gi+Ya9yPeWX9m4h2MAljKWRpb6fECyl1/JROgbG0xtw+wvE0t8ip6c0+t+FPu2N tdobKUlpV47VUOx8JakV5Rvr9OSxeBzjahS9CRUdas09nfR0fdwfFsVGEYoD7Qw9nuH2UR oSWbJfams3bWI6muDZ0hl+5pYAwPaIRQxzPsmjk6/hVM7SLKEKzsgbTufOpMG7MMMcbXe3 SHoXHxDtQV3t4irbyfdeVKJosR0soUSUMuDZqz/yQG/A5L8BW5NAUMV1uqjna1PBJR/i2Y T8jpUCwnZTe/Fe3dF86G/bsjxVje/ORDtBt58IZuSojbBxjbUxybFeeHaADfFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785171367; a=rsa-sha256; cv=none; b=wU4reYODR9P9uaYnuJMq3+uSN1COqc+xJzJFVEtt11XETdakOWGRnyXDCZzDXYt0w7pnVa jEGCBkbDRIISk4Ae2OUgkZYPO9ZBv4emNu7a0LWFhX79wd5G1qejD5EbJHzr7bdk2Pq7tQ GxTKVC5gXpjGvX1BpsvRSbhNZ7Gj7SRQvoqhR7kBBRN++dPejSZ3OwCwoZA5NmP2ZMX9Sy ZyRAIY0rHecadqqnrOJ+bVlFCjIpn34dvGoq9kj8V3XAAQ8ZzTM3BDnt2dugz1pe6uNU5U QYnO2k6QGCnsJX9UTNlCPs+LX+I/k2EHI1qc3L6QvXi/y5MdGl1yaWnIDjBYJQ== 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=1785171367; 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=R8w/ulg012nOUatCfZlXQLCcwZlCZ775ADhb4r/JJ1o=; b=oThhHe5a4SocA2aXCyyZzKu+m9sG1BZM/kUCmly41/Ss7rX5eh4lDv+KOldo2agTSKcCSe HEdmooALulAlQu1Cx7kxB8S/xPPuASqKn8W0Vyu/Xmr5Ux2AF/mP07Hcc0hAtxnAQW8NLR BUiPngwbx6h7uZelU5bKd/G5ZaL7OAWaQkZMXS34ADoBQcn5iiKgGuUIpcGQvEdpntox8o KlXSQ42zJEPztnyOLK9x2y94YXUsD3TWY60bUz8xEcimvIZcxtQtHD8jXcmYHsyBvveGz/ 9ox2a5gUTDKBsdh4lN88zQZRILNaAQuRNfdyRgRLgrzKf6VLxV7nvwUnFOC7MA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h84Vb2bTkz1GQN for ; Mon, 27 Jul 2026 16:56:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 204e9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 16:56:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: bcbcd7303009 - main - Merge commit cbf48349e3e1 from llvm-project (by Jessica Clarke): 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcbcd7303009344dc1051e4601284620bca29be8 Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 16:56:02 +0000 Message-Id: <6a678da2.204e9.6efc0abc@gitrepo.freebsd.org> The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=bcbcd7303009344dc1051e4601284620bca29be8 commit bcbcd7303009344dc1051e4601284620bca29be8 Author: Jessica Clarke AuthorDate: 2026-07-27 16:53:53 +0000 Commit: Jessica Clarke CommitDate: 2026-07-27 16:53:53 +0000 Merge commit cbf48349e3e1 from llvm-project (by Jessica Clarke): [NFC][ELF][PPC64] Pass address not offset to writePPC64LoadAndBranch (#212275) Every caller currently subtracts the TOC base in its argument, so move that into common code inside writePPC64LoadAndBranch. This will also allow a different computation to be used in some cases in a future commit. Note that offset is now unsigned not signed; even previously, all arguments were uint64_t, and all uses are unsigned, so making it signed doesn't make much sense. MFC after: 1 week --- contrib/llvm-project/lld/ELF/Arch/PPC64.cpp | 3 +-- contrib/llvm-project/lld/ELF/Thunks.cpp | 20 +++++++++----------- contrib/llvm-project/lld/ELF/Thunks.h | 2 +- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/contrib/llvm-project/lld/ELF/Arch/PPC64.cpp b/contrib/llvm-project/lld/ELF/Arch/PPC64.cpp index 3cd4a6294e2a..8e85cfab8a63 100644 --- a/contrib/llvm-project/lld/ELF/Arch/PPC64.cpp +++ b/contrib/llvm-project/lld/ELF/Arch/PPC64.cpp @@ -1168,8 +1168,7 @@ void PPC64::writePlt(uint8_t *buf, const Symbol &sym, void PPC64::writeIplt(uint8_t *buf, const Symbol &sym, uint64_t /*pltEntryAddr*/) const { - writePPC64LoadAndBranch(ctx, buf, - sym.getGotPltVA(ctx) - getPPC64TocBase(ctx)); + writePPC64LoadAndBranch(ctx, buf, sym.getGotPltVA(ctx)); } static std::pair toAddr16Rel(RelType type, uint64_t val) { diff --git a/contrib/llvm-project/lld/ELF/Thunks.cpp b/contrib/llvm-project/lld/ELF/Thunks.cpp index 65d0f094c43c..45b9ab9530e0 100644 --- a/contrib/llvm-project/lld/ELF/Thunks.cpp +++ b/contrib/llvm-project/lld/ELF/Thunks.cpp @@ -1402,7 +1402,8 @@ void PPC32LongThunk::writeTo(uint8_t *buf) { write32(ctx, buf + 4, 0x4e800420); // bctr } -void elf::writePPC64LoadAndBranch(Ctx &ctx, uint8_t *buf, int64_t offset) { +void elf::writePPC64LoadAndBranch(Ctx &ctx, uint8_t *buf, uint64_t addr) { + uint64_t offset = addr - getPPC64TocBase(ctx); uint16_t offHa = (offset + 0x8000) >> 16; uint16_t offLo = offset & 0xffff; @@ -1413,10 +1414,9 @@ void elf::writePPC64LoadAndBranch(Ctx &ctx, uint8_t *buf, int64_t offset) { } void PPC64PltCallStub::writeTo(uint8_t *buf) { - int64_t offset = destination.getGotPltVA(ctx) - getPPC64TocBase(ctx); // Save the TOC pointer to the save-slot reserved in the call frame. write32(ctx, buf + 0, 0xf8410018); // std r2,24(r1) - writePPC64LoadAndBranch(ctx, buf + 4, offset); + writePPC64LoadAndBranch(ctx, buf + 4, destination.getGotPltVA(ctx)); } void PPC64PltCallStub::addSymbols(ThunkSection &isec) { @@ -1456,10 +1456,9 @@ void PPC64R2SaveStub::writeTo(uint8_t *buf) { write32(ctx, buf + nextInstOffset + 4, BCTR); // bctr } else { ctx.in.ppc64LongBranchTarget->addEntry(&destination, addend); - const int64_t offsetFromTOC = - ctx.in.ppc64LongBranchTarget->getEntryVA(&destination, addend) - - getPPC64TocBase(ctx); - writePPC64LoadAndBranch(ctx, buf + 4, offsetFromTOC); + const uint64_t addr = + ctx.in.ppc64LongBranchTarget->getEntryVA(&destination, addend); + writePPC64LoadAndBranch(ctx, buf + 4, addr); } } @@ -1519,10 +1518,9 @@ bool PPC64R12SetupStub::isCompatibleWith(const InputSection &isec, } void PPC64LongBranchThunk::writeTo(uint8_t *buf) { - int64_t offset = - ctx.in.ppc64LongBranchTarget->getEntryVA(&destination, addend) - - getPPC64TocBase(ctx); - writePPC64LoadAndBranch(ctx, buf, offset); + uint64_t addr = + ctx.in.ppc64LongBranchTarget->getEntryVA(&destination, addend); + writePPC64LoadAndBranch(ctx, buf, addr); } void PPC64LongBranchThunk::addSymbols(ThunkSection &isec) { diff --git a/contrib/llvm-project/lld/ELF/Thunks.h b/contrib/llvm-project/lld/ELF/Thunks.h index 446345b8517f..a802827ba407 100644 --- a/contrib/llvm-project/lld/ELF/Thunks.h +++ b/contrib/llvm-project/lld/ELF/Thunks.h @@ -85,7 +85,7 @@ std::unique_ptr addLandingPadThunk(Ctx &, Symbol &s, int64_t a); void writePPC32PltCallStub(Ctx &, uint8_t *buf, uint64_t gotPltVA, const InputFile *file, int64_t addend); -void writePPC64LoadAndBranch(Ctx &, uint8_t *buf, int64_t offset); +void writePPC64LoadAndBranch(Ctx &, uint8_t *buf, uint64_t addr); } // namespace lld::elf