From nobody Tue Oct 25 16:00:54 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 4Mxc9g1Ycmz4gBr6; Tue, 25 Oct 2022 16:00:55 +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 4Mxc9g14prz47VD; Tue, 25 Oct 2022 16:00:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666713655; 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=DjQ2OcQ9VAK22d22T1rZLRqZ4jN8UhiuhDuVvaFQ/qg=; b=hb0mfnjc3UBJ+pbur2VziyYcDtGK9pwWVn5KhqtUzHYeiNOfU8wP1I9n5vRoAaNJN2yvqj pnHxMaxJrEhVf/MH+VfGmJR3g57qkklagUSUA2T66WJCSBH4NHBOXcuz3w+2gQXT95oBUl 4jFGOIt/SJOiiBJDE+vxNcO7z/dEpRRJYkVgdeKawULiNz/q5WHnpDXdNGEPce2HfO6PPI fIx/l5YprZJpQPy2ag+q+9pBSB84KU3Mh05GuPlgyrrupj6Sg/vhe/O91pRn6VXNoiR1nx zS9kjJtMXq1mJ16qqqeHCgFKtlWg3OuxxKmwyyvjfePJrXaIyLAkWq2eaIccXA== 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 4Mxc9g08PNzkPG; Tue, 25 Oct 2022 16:00:55 +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 29PG0sHY090553; Tue, 25 Oct 2022 16:00:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29PG0se4090552; Tue, 25 Oct 2022 16:00:54 GMT (envelope-from git) Date: Tue, 25 Oct 2022 16:00:54 GMT Message-Id: <202210251600.29PG0se4090552@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 829145388bad - main - x86/include/elf.h: make inclusion blocks for elf32.h and elf64.h similar 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 829145388badfa70796b97bed1d92be254966766 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666713655; 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=DjQ2OcQ9VAK22d22T1rZLRqZ4jN8UhiuhDuVvaFQ/qg=; b=i0M2snc3WaJELpGOhpSqBazTd8NqlWO6dFjVqrFjE+GRMO7bGEr9FrWPEX2y1cVve/2AeN cY3Qxu2Pt4TdZgv3EIJKwVwlhit4NNuFLS9hf00NSjlLmq4BeFwyXwVbfGvuHgv8Yle8O1 KAjQyg7NX2GD7tHaS/WRa0I81WNMauT84x57ISUXsXjd0mXrjKhRHjhpA4rmQ+UX5sRFbT 3hy3c89Odiyu1nj5sLWZAr5Aeu9gNZqEA/KxqTtEOqTKfHWgYUbflV+ge9Eva8M+ZwZllc vE/FjQvQbhdevURuV56HibgLzohI47exlCtXXjM9JkiUNWyzuRxPBwF5on2XHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666713655; a=rsa-sha256; cv=none; b=rjNFgeLql2PTUt3S48hg+nvg9urWAUHfNqV7Ij9po9t3DeNqabdaMh7aBBGUvOwCYd5qmX Ff7Xwwe13Uhjd2UIoUed8Dg5TPngSTEj5Fjkvq4U8qb2LoxYpdd6xkFtQIy/jkHiNFzjKd zyOn9cD7tO/RbBgpfR5/7SfkUWUtjSR/eiZB0a60Jn9HsOAuhLBRilsZ3OfpSQ2lJuZbCY 9S6HPUhOnMisx7uS5Um/ZrtYmzvrmwUsfW21RMH+ciu4mHxPa7So8oO8VaAHsqRvW5NWaT eN/n5FKhNS19CNeFMBwEym05vHofZJD/jASW3cDvnGRfQ6bQwXr79uAG0YZT7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=829145388badfa70796b97bed1d92be254966766 commit 829145388badfa70796b97bed1d92be254966766 Author: Konstantin Belousov AuthorDate: 2022-10-22 20:05:59 +0000 Commit: Konstantin Belousov CommitDate: 2022-10-25 16:00:44 +0000 x86/include/elf.h: make inclusion blocks for elf32.h and elf64.h similar They were copy-pasted when x86/include/elf.h file was merged from its i386 and amd64 counterparts. Having the text around inclusions significantly different is somewhat confusing. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D37085 --- sys/x86/include/elf.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/x86/include/elf.h b/sys/x86/include/elf.h index e8744858e4b7..7b2825579e65 100644 --- a/sys/x86/include/elf.h +++ b/sys/x86/include/elf.h @@ -32,14 +32,11 @@ #define _MACHINE_ELF_H_ 1 #if defined(__i386__) || defined(_MACHINE_ELF_WANT_32BIT) - -/* - * ELF definitions for the i386 architecture. - */ - +/* ELF definitions for the i386 architecture. */ #include /* Definitions common to all 32 bit architectures. */ #if defined(__ELF_WORD_SIZE) && __ELF_WORD_SIZE == 64 -#include /* Definitions common to all 64 bit architectures. */ +/* Definitions common to all 64 bit architectures. */ +#include #endif #ifndef __ELF_WORD_SIZE