From nobody Sun Dec 28 05:48:53 2025 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 4df7h613Rbz6MTLR for ; Sun, 28 Dec 2025 05:48:54 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4df7h558Kvz3Dn6 for ; Sun, 28 Dec 2025 05:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766900933; 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=vWOCI4ouqGxoIDYljLYDh+b697fSu/aQpzjmjT98acA=; b=ceB4oX0iXk3ynmJG8v3qU/3KWglYFqmPwhG+szrlmcL8EaqFTTg0BLow0mBBdjnOoXoKdt UvUVLizfRYMjXIAbbefNCZohL5f1zNc8+FemRC+8WkayK4XCXAyOQ5cQ0VlfxbhKSpM8eN cp5oA8jlVQ1/wiSBU5j2saMsJpQcbw7cTzGxxrRh6T1t7GCch1UajyF4V6w7nj5pVNYVvn mpCNvmuilvx7DyE1CxwHLBV1cPFLTuygb7tn7/lkBBFam+2lUrzhKclQ4FjChmuQizzyc1 CEpn58oyqYt3F2p85iXfX8sFl7FTYZXRXbfPZ1rGfhiHQ0TjFBjbSH3EsqqRnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766900933; 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=vWOCI4ouqGxoIDYljLYDh+b697fSu/aQpzjmjT98acA=; b=eQS1dz/YL1fLMqK1vsqRt2L8Ud81EXaFvQVOBdzyoF38mfFXhTCFJf2qrfUVVsT0yhGhAI kwD/H+EQvuHRjuXWYPmEV5QfZ6s8a6FiFJe8IO3KdEQE9YR+vN26kimrFUdcxuB8C+3PHC n4/txRABeDXzaz5j9zuqQWpoaJMAHeR7rqVh3iNwYix8LYDlV5FNOy6efwSnqpTwAH/qpT erTgAzXmyD+fTukqN3Ucd0YguqZ3abUQEliN8ACwnlQtc8estIeTb9iRe+5DcYyr8vFmXu Ig85jLsyQRRS8TYwLJMjGA/HWu/v2Ez4+tthMnuTC1e8LbBjCeB5H6Gbdr7+bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766900933; a=rsa-sha256; cv=none; b=ggDK9BKbM6Vt60uf1gB/0A24V8p8NQn65EsLir2sVXq4p+kFvG6Cp6MIf85svseXqQ28RJ vmRG6iGlppKal51jJgSgqy+3zlsL8QKAa8J8WT03yOEvxBYidR1gEJNpI5kyc/zWgcSLAb /pi1RdaOlqD7sL6xgj3Y2KnCSL+H/jtWIrshyDuuBBBY1Y/OW2h++3oJV097yARjxnCnYF rcQvkHPRA6otOKaLkB+zvc8LVHcqojpV/2uCRqmcejwj0drHBi98MGJmhvJmJ3PD8XebfT +uJOkfFdukDFApYrGy+VqpHsKK5W0qFtOB3lTal3eTsOPZMy3wtY/tN5rGHSAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4df7h542M5zY7b for ; Sun, 28 Dec 2025 05:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25792 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Dec 2025 05:48:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 424089a0fc82 - main - loader: Fix powerpc64le by working around slof bug in qemu/slof 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 424089a0fc82ee9db8659b8c1099bbbde8999473 Auto-Submitted: auto-generated Date: Sun, 28 Dec 2025 05:48:53 +0000 Message-Id: <6950c4c5.25792.96d1fae@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=424089a0fc82ee9db8659b8c1099bbbde8999473 commit 424089a0fc82ee9db8659b8c1099bbbde8999473 Author: Warner Losh AuthorDate: 2025-12-28 05:27:03 +0000 Commit: Warner Losh CommitDate: 2025-12-28 05:27:03 +0000 loader: Fix powerpc64le by working around slof bug in qemu/slof Fix powerpc 64 little endian booting by adding some padding. Due to https://gitlab.com/slof/slof/-/blob/master/lib/libelf/elf32.c?ref_type=heads#L114 https://gitlab.com/slof/slof/-/blob/master/lib/libelf/elf32.c?ref_type=heads#L150 using <= instead of <, slof used to loop over the phdrs. It overruns by 1 and so on little endian it swizzles the first 32 bytes of .text. Work around this by adding 32 bytes of padding after the headers. We should fix this in slof, but it's in the just released QEMU 10.2, so we have to pad things here for now. Now powerpc64le + qemu works. MFC After: 3 days (maybe EN too) Reviewed by: adrian, jhibbits Sponsored by: Netflix --- stand/powerpc/ofw/ppc-common.ldscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/powerpc/ofw/ppc-common.ldscript b/stand/powerpc/ofw/ppc-common.ldscript index e12dee74824a..edd37eba8fca 100644 --- a/stand/powerpc/ofw/ppc-common.ldscript +++ b/stand/powerpc/ofw/ppc-common.ldscript @@ -9,7 +9,7 @@ PHDRS SECTIONS { /* Read-only sections, merged into text segment: */ - . = 0x02c00000 + SIZEOF_HEADERS; + . = 0x02c00000 + SIZEOF_HEADERS + 32; .interp : { *(.interp) } :text .hash : { *(.hash) } .dynsym : { *(.dynsym) }