From nobody Mon Feb 19 16:45:06 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 4TdpLC383mz5C99P; Mon, 19 Feb 2024 16:45:07 +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 4TdpLB6vwqz4bFg; Mon, 19 Feb 2024 16:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361107; 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=gAj1TevMJJFaqO4SMtJaicBw6EbJiJ9naWXzfrSFwzw=; b=Mn4/ciYAUI7HfOxwt5ucbIU+OfepciyX1ji1D7J2hzz6aSd2+vsHUvSMNIyIkxF78TG2HC 8v5nWi6lpL2i7jnZaEm+HjEOwIKMj7Mf19eRlSgaE0lYmUYRU+F6DBkWKCHzHIXFVZS2Km lAaHHCV2X5nxpaCsJ+xSNWHx0xLLFCxUWnE6cPthFQnyYzLgb9c99dTcaSkLwdWtHgxhrc f9KojjMFnEvZB6rLgC7soVJjtfpv/8pvAqn3hofe5J1OSDZkG1Cl3RK4GvBiUTvpFe+McW sefj4f1iDotCwcLobtzqg95XpV2MR3p3l2IxeDjI9WTAF3hL+p0svNJwZVon+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361107; 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=gAj1TevMJJFaqO4SMtJaicBw6EbJiJ9naWXzfrSFwzw=; b=n6JzqeR5cv5SSnZaku9yrm6rKF3pmGfaxY1e+U2hydbElLc2nrSo1A8/S/yLE9I1fIiYT6 UWGQpsrw04B8rZuipRDvcdHitKxO8rDGcVw6nbR8wW5zYpacqE+eVMhQ9KsOnlr684w3P0 W//LhqOD0czxUq55K4zoebe29IxFdVaBovASYmiQHqnmZNxGyKAjGQWDkbtxInGWfTfeYj 8PIdTpHBeJT71aUmmmkrL9g2jQtZ3UiSUnYc603563EAbqr7lEtLT92PZyiE2892lsUQKB Hi8ccu1H5F45ZcEEwsnFXAteoF+BFlgpB17U/F9WsiCd/2LDMabDfBy31IXJ3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708361107; a=rsa-sha256; cv=none; b=ATMlyNr0pYlS/Bje8jsEx8Rvs3vgbqcp4t7/UuMB602xg5yqfE6DDBPETGYv2O/dkQq7Am jFnaKGxPvURmoy9LMWCF6KU14dBxkQwg3Fd4imaipVmDjDPE2V4eN9UT0B0yaznYQ4DUDv E3sQTnFIk8O/wvuQt6dHWDMk9CMM1/emv4opzGhKJyCF4qxiiU3aunN5KAbqyU7XYm3xl2 2X30ekbEhassbpOsYwAGgUTgYUUCoqqA6VOl1+yKD0nUGgErh/nlSj501oItIXrXxiJboC IJZzgAU/H9nbFBQ2QauOMABor2m8JZMatuE5ssjAK+2g/+R2jylwH8+jCQ1eZQ== 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 4TdpLB61d9zjfc; Mon, 19 Feb 2024 16:45:06 +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 41JGj6r3095365; Mon, 19 Feb 2024 16:45:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JGj6Sb095362; Mon, 19 Feb 2024 16:45:06 GMT (envelope-from git) Date: Mon, 19 Feb 2024 16:45:06 GMT Message-Id: <202402191645.41JGj6Sb095362@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: 9792d605235a - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 9792d605235ab09113053f845d52aeeff24a58e7 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=9792d605235ab09113053f845d52aeeff24a58e7 commit 9792d605235ab09113053f845d52aeeff24a58e7 Author: Andrew Turner AuthorDate: 2023-10-12 09:45:43 +0000 Commit: Andrew Turner CommitDate: 2024-02-19 13:10:51 +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 ce82734833cf..934f66fee953 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. */