From nobody Tue Jan 24 22:12:43 2023 X-Original-To: dev-commits-src-branches@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 4P1h6h6F85z3bgC2; Tue, 24 Jan 2023 22:12:44 +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 4P1h6h0QrQz3Dsc; Tue, 24 Jan 2023 22:12:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598364; 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=dKEcJRkR1NzkTT5RF3osnx8+dYNtiNWNLzfozwDkhVw=; b=MT23FYPno3h1V7DnSd4WljT2t3qdPwayp3w2WVPR2IRHKhiU2wQ5acrljsVznTSgevaeau 1Nh7APy+rsiqHcZQ5eTzTpcVwLz2xnsmiNsrEUcQbZIYXTBNuTRPiLtlnMBx4v1zhm64vP iOeLwC+fwupobBxa+H05ireAppEQfjqb7CrRgJV5cBEoLO5ZamVQbce61W60wW7yezIlrE E9DK7456NcqQlAhXAQTK7lNoAIidSZH8ZGZaT2aWW2MTyRk1Rj/mNYeYiEsozGRGs3r94p 63INw+3FUCfFett+YTuuYVmw0giJAfPBlRj4oQHC+bJzVcA1gCtzDjvSHDAdQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598364; 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=dKEcJRkR1NzkTT5RF3osnx8+dYNtiNWNLzfozwDkhVw=; b=BROe1tbbDVwSzHAN8uH7DFZk0HergNjcwedkw7XvfCo4ipf7NJmin/fCNoBIGSeKnkfuRW CZNGVzJpTQz1bQz5fiPSrKeBj17KLM2M5V2fMs2p+nRm43bQjrymnZ5+DjT7H4oT/GvDtU bD1x8R5DDVxKnqxnhU6kcE2HlM9I09/2PSTdV+bNIHRXrTsvnbzvCbYJyNbw3SMipz7c6V eZEVFJUFoAgByoTvBLxltsszphtMoiY3kU7kBZ35qGTlFxwVJcAw5catmmNWNcFv3mtjgG rKe27PJ/oWXRPVkeaDXCd4tvnPva5y91YUm98tKXt7aLytMcF3CNdq/C4iqcaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598364; a=rsa-sha256; cv=none; b=v+s86xWUnGFS2QaJsxidirRf0ZYn+LAYCQABvSmGwfOfjKGr6ugdiwNN54r971ppexSSQ+ sBajd1C9VWAG2e4x3G6zQM+WgdRaPUWyGAcEdfv710AaWXcqej9dxfk8OR0lAHWZLdX71P 0GCUMztinNRv5pAMnmJyuifcVA8roLbFgujYsZwJ2JWRFs5CvWIEu6v4jIrfqWbIIouWnD MKj9yVyB8h2rFQ8UZQlnjkNEJKoMJGSKynybzKvHw5ACTrc4/xuoWbfaF6+LyUDCwzO9xh 0hy4aOPnrdN50jQ3j4iJkLxqek1iU6ZvZMqv23tmdo0PoHcUL5ISjqBDBNORdg== 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 4P1h6g6ctWzQgl; Tue, 24 Jan 2023 22:12:43 +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 30OMCho8087436; Tue, 24 Jan 2023 22:12:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMChYD087435; Tue, 24 Jan 2023 22:12:43 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:12:43 GMT Message-Id: <202301242212.30OMChYD087435@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 61c9a00f8e5c - stable/13 - stand/elf: Only support swapping headers on powerpc. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 61c9a00f8e5c17ffbabf46710c2dcdec32acbe3a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=61c9a00f8e5c17ffbabf46710c2dcdec32acbe3a commit 61c9a00f8e5c17ffbabf46710c2dcdec32acbe3a Author: Warner Losh AuthorDate: 2022-09-16 15:10:14 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:35 +0000 stand/elf: Only support swapping headers on powerpc. Powerpc is currently the only architecture that we support more than one endian. It's the only one that benefits from this swapping, so restrict the code to there. This saves about 1k in the i386 BIOS loader. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D36577 (cherry picked from commit c0ecae78abbe5c925cd05d5e218aa6f038cd03c7) --- stand/common/load_elf.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/stand/common/load_elf.c b/stand/common/load_elf.c index 363da4756c1d..81b9e3e7ee9f 100644 --- a/stand/common/load_elf.c +++ b/stand/common/load_elf.c @@ -98,6 +98,7 @@ const char *__elfN(moduletype) = "elf module"; uint64_t __elfN(relocation_offset) = 0; +#ifdef __powerpc__ extern void elf_wrong_field_size(void); #define CONVERT_FIELD(b, f, e) \ switch (sizeof((b)->f)) { \ @@ -203,7 +204,22 @@ static int elf_section_header_convert(const Elf_Ehdr *ehdr, Elf_Shdr *shdr) } #undef CONVERT_SWITCH #undef CONVERT_FIELD +#else +static int elf_header_convert(Elf_Ehdr *ehdr) +{ + return (0); +} + +static int elf_program_header_convert(const Elf_Ehdr *ehdr, Elf_Phdr *phdr) +{ + return (0); +} +static int elf_section_header_convert(const Elf_Ehdr *ehdr, Elf_Shdr *shdr) +{ + return (0); +} +#endif #ifdef __amd64__ static bool