From nobody Mon Feb 19 16:44:53 2024 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 4TdpKy4QBxz5C8yB; Mon, 19 Feb 2024 16:44: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdpKy1DQVz4b7J; Mon, 19 Feb 2024 16:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361094; 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=di6dBBQT+nn4394MkE0zFBwPdH3ZOKTcN/iXk6Vqj+I=; b=esO8b4WtBkpUYJuGJ+QuypftJDC6Us2ADcYONegG0MxosDVSxR2vfzX2FW8ZFmK/AY+nM3 RtCQkriX+x3GL6HSS0iRdzt/HqeTe9Rp2/mwuKQmbdV2KxxGNCHC3EUJvpKz1mg440Bj5z XqfI/W5jaIvj4fLfSeFf4IncsYYLrOzAh1HPaIGJvOe6WMoizltPrD5ZzXANEYg2qfn3Ae fgvspteUjz9yFB35qZq5JXOuWR9pdK6zVLbY5a+LhpaQ1eJB60lA269Ubw1UxZ83Oeu/IO CvczNuEaOg4KpZmLx2eVRzxXLc2HfYz+rYf3wS8h42tT3PeGIr3fPWrBRpjfOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361094; 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=di6dBBQT+nn4394MkE0zFBwPdH3ZOKTcN/iXk6Vqj+I=; b=g0BOsDWjhtpvQ58g1H1L7fiC//zq2GfuUE9gB71Vy8hzUxrXTMOoo7EvjU0Kb9wQzEewwW AssorAS0V7d+2i0cuKMUBgpPgefg6pkSua2FmlGhlZMLDB3223aRPtue7R3zoCipEVcBhM oPAkiWDB9wGHwQOHCRaLqygnfZYqUcXJ27JM5irc2rXgGMDV3zXwe3/R7PzNRMukUVXh0r 3dZ7H+9JCZEp+sUmHz5G89KO8yaegiA7MbdlL/MsxsESBFD8spBpeywmXd4vn3XFs00Xwb i1f2kBFbpgjOEerOuJw4nXjqeLTx2IX7EDzM+jxBTWNgCV91yoFdL7AOt2zQoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708361094; a=rsa-sha256; cv=none; b=UVReMVDGk0wv3GZyFZ2o05/Rxrch1A4WeZto+PToRI50dsn4uE5B5c663yXvq0F7c3QHnn TY3y1vGTq/jmhMk4bCElxjkkHziSGtYVFW02CKqkSLBd7ChC1UQONdjPihnwzsURcrUkS4 btrUoZS+QMOhYhUZ3rycD4WjBjP3WFCPF56PGsZaqH/uWlk5apO3vtB2sgUXKWu+yVEexo 9z1HWVnVJBxBhG+4a42qZzKIEX1UbhIiMcVuCTN5EB1qoXSSVCNsJ7Pfx0aQYh2k3wtKBs SE94jdkWfPaMptZMapmLvfDcajPwHLdoggoEb1Pg/+LMkjRjvqYURMUVlk7/gA== 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 4TdpKy0KNnzjSN; Mon, 19 Feb 2024 16:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41JGireS094147; Mon, 19 Feb 2024 16:44:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JGirll094144; Mon, 19 Feb 2024 16:44:53 GMT (envelope-from git) Date: Mon, 19 Feb 2024 16:44:53 GMT Message-Id: <202402191644.41JGirll094144@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 892cc8813aff - stable/13 - sys/sys: Check for __ASSEMBLER__ in elf_common.h 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 892cc8813aff01429614a27192061d013e8f52c4 Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=892cc8813aff01429614a27192061d013e8f52c4 commit 892cc8813aff01429614a27192061d013e8f52c4 Author: Andrew Turner AuthorDate: 2023-10-12 09:45:43 +0000 Commit: Andrew Turner CommitDate: 2024-02-19 12:40:43 +0000 sys/sys: Check for __ASSEMBLER__ in elf_common.h When preprocessing assembly files with clang or gcc the __ASSEMBLER__ macro is defined. Check for this as an alternative to LOCORE in elf_common.h so it can be included by .S files. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42224 (cherry picked from commit f39010b1393d471f1c59195acde5d95cdb66847c) --- sys/sys/elf_common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index 2bb7e458314c..4af241bb085c 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -44,7 +44,7 @@ * not include the padding. */ -#ifndef LOCORE +#if !defined(LOCORE) && !defined(__ASSEMBLER__) typedef struct { u_int32_t n_namesz; /* Length of name. */ u_int32_t n_descsz; /* Length of descriptor. */ @@ -112,7 +112,7 @@ typedef Elf_Note Elf_Nhdr; * The header for GNU-style hash sections. */ -#ifndef LOCORE +#if !defined(LOCORE) && !defined(__ASSEMBLER__) typedef struct { u_int32_t gh_nbuckets; /* Number of hash buckets. */ u_int32_t gh_symndx; /* First visible symbol in .dynsym. */