From nobody Fri Oct 20 15:45:23 2023 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 4SBpnb3Y4tz4xvnZ; Fri, 20 Oct 2023 15:45: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 4SBpnb34ctz3Ccc; Fri, 20 Oct 2023 15:45:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697816723; 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=Ivm+Uhf24ZmmIuosdME8F+vXEI7658eyBs4M5cXLyks=; b=MgBef932uGXmIByadVsjt5mh3Vm8ALlJgmgUrStIUUUa+l471nkzenf17019hBUkTpoEMw aTGE8WQ37qaKwdShkuRY3eOG176JmUE8XjpxmPiboNGrHwmkjtby1xLENDYaBhpctuctf9 m+BMJd2d4q799jTw5I7YCPZfwyQWYaxuyxM9eO3hs4rSL//52Izz3qmsNe4qai/tTRFiZx 4vzYY2KOUu0NJqTjJlGL3+BESzruzewn5NdGg5S0DYv73c5peb/0yGI8XyLZPDHZTVQyJv iRy+wB38oS/twFuY3mYLxkm6oJt5GlhvpyMHEnr5PtEc5zNO50MkR45OG6m/gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697816723; a=rsa-sha256; cv=none; b=Q56hznPFAo+BiwvUCdZQ5NDyDVl1Ycx/YorxaOvr1TemhuhfKsd4c4ByCODjR7U3N0x/ov bt/2dRM679XdfR9HTT6qxFXip9QWS6f0xg4AyO1nVqD5OX73pgoGEKGcVV4e/O6u7tDLbL rwQF/eZTR1wjfy09VElXlmz2/vjlQcOFijNGi3vxuWP1mF5u0a7UGd7esh5Tzx81cN4+iR mbjgKBo2X59lokP9LD2m8yguUZABDgSU8D64sOt4kvSpdOejN2wjqxBl5IKyzD5fMDWDSN ngo9BxWZZTh+5RLzNwtr0p/3kg1AXxIvBIbnxt9Oz913NuCJIxMWXa90VCzjUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697816723; 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=Ivm+Uhf24ZmmIuosdME8F+vXEI7658eyBs4M5cXLyks=; b=tuNLvDpVayy2LEd4b5biyD4XveZxPrQTQG8bBjVMs4oCRrEG8sHBiaHx0imt8GSxKSultH 9FUJm0F9KU4p7AhhrJkxPMNE6C3G+Qsv2y0KTpnnfii/zXPGp2B+LKj+w0Pq4mq0W8Hn26 IY92yVyxrVhr6NIi6cYoVjAD7J8qNQUh5NTm26sHLSmGWMeQjY+ffK+itJ5Zw4n1HUY6X6 yh7JTecEELZbkZqhWPRvGLfuowGz6x8RL7PIVMFQDqs5B2CMk0gDuciYZQQ4+DEkOsmGPK Sp0vCBS+dxIGhRhK/w89jNgV+zKyAEYBikTwo5MVAJ92rxxqKQlophQKVx1heA== 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 4SBpnb27MDzfHw; Fri, 20 Oct 2023 15:45:23 +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 39KFjNH6004980; Fri, 20 Oct 2023 15:45:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KFjNZo004977; Fri, 20 Oct 2023 15:45:23 GMT (envelope-from git) Date: Fri, 20 Oct 2023 15:45:23 GMT Message-Id: <202310201545.39KFjNZo004977@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: f39010b1393d - main - sys/sys: Check for __ASSEMBLER__ in elf_common.h 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f39010b1393d471f1c59195acde5d95cdb66847c Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f39010b1393d471f1c59195acde5d95cdb66847c commit f39010b1393d471f1c59195acde5d95cdb66847c Author: Andrew Turner AuthorDate: 2023-10-12 09:45:43 +0000 Commit: Andrew Turner CommitDate: 2023-10-20 15:36:28 +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 --- 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. */