From nobody Tue Nov 1 00:46:23 2022 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 4N1WYC6b90z4gy33; Tue, 1 Nov 2022 00:46:23 +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 4N1WYC684Xz3QWv; Tue, 1 Nov 2022 00:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667263583; 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=7RW+eRcsn77kEaoBFlTvbWiANsIBZC/siyXLtbMpzXQ=; b=kJKyvUOCfqDn/BndE1N+oprg+E2hCGjah+MbSTzFZyzQC/JauLKPWwNU3WLFIRIef5hDkj tLLI8deIGudgZYcGWbX6Ynv1yvqxCpELL/Z7F2zYoNphMogRdt5HPaT6Ct1AYecDU0fn8J AijiGcr9sgwG/y1rlrmKjIRl6PtTt7zu2gEhQhzlaZYnb9vOeBAZHu8A1TMAc08buUwWgP 9aUMkfnyE2+FuZi8r+iAQo4nGkd0hWj9wdkbFRu7vhoLIjier968vsy0xUGsVXc8WVukq0 jn+p/EyaW21xzdxbFSGaTLfqy456ngxo/uRxmAUHvdFdd4/oa9I1KYCbt4I0fA== 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 4N1WYC5Dpjzwjg; Tue, 1 Nov 2022 00:46:23 +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 2A10kNN1041849; Tue, 1 Nov 2022 00:46:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A10kNVG041848; Tue, 1 Nov 2022 00:46:23 GMT (envelope-from git) Date: Tue, 1 Nov 2022 00:46:23 GMT Message-Id: <202211010046.2A10kNVG041848@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b58ef09e2766 - stable/13 - x86/include/elf.h: make inclusion blocks for elf32.h and elf64.h similar 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b58ef09e27668746d1007efbc3750291f152fe88 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667263583; 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=7RW+eRcsn77kEaoBFlTvbWiANsIBZC/siyXLtbMpzXQ=; b=QlRCYOgGceCavmr6p4vbRyWz+/TL0Tv+1zt5uKn/oFuahl1zMXzdVUtawe0tdZcArg1n2h RUuh12uioGmYzrJUSuoHJKFA9G8gKRYPgx0AgUHLAeN1PSKi642aU1ajYlMCD3P4bsOuhy bF8ZwOtqAnnL4P4x2yxkFy8SkZmLSyKxuCUHk161jbEErznZBlq7S9iyFQ1y0RtKkLz6FM sAOCJZ3F4Ks0FlGffn+hxLxNWSFa37DW1T3KVPsPAHcaM5qYhgcftb36iErkVp0aLsHsp+ kHLIHVpvY63CsNIMNuWk33INeYr0BCvwZA8mZLO7QPjEEf3vB/p4hi4MidRdSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667263583; a=rsa-sha256; cv=none; b=eIO+M5QdghLr1wkIVZZdFODP+u3ka/GIkZBn9BEWri11/f4CUMvi0+WojWbvjRrySC++Ty tVnW+OVlKHU5NEzk8YriHflmayTrxiUK/QJlwqSMMdPd0vmaDgO5wKgFCO/PdAD3F+oCI2 LdrYzWBOxXN3eOZxh7iPa1ZRTItj+5AczkKSaTY8lNEZqkCaVNgijYpaqoyJA8wf4duZNn VWlFIitRCPRu5V7zsrdltKY4SnQux2TcgWpA5CcSNtSWQanA8pNsoeR7B1HZDFAy18Lw3s 5ykiVun5Kpe78iWobWhs/SXmfEWObwTnsUdsXHj/qnyLRwQ6AbXbIbvI/0avZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b58ef09e27668746d1007efbc3750291f152fe88 commit b58ef09e27668746d1007efbc3750291f152fe88 Author: Konstantin Belousov AuthorDate: 2022-10-22 20:05:59 +0000 Commit: Konstantin Belousov CommitDate: 2022-11-01 00:44:40 +0000 x86/include/elf.h: make inclusion blocks for elf32.h and elf64.h similar (cherry picked from commit 829145388badfa70796b97bed1d92be254966766) --- 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