From nobody Mon Mar 13 13:50:38 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 4PZyjB4YmSz3xkXP; Mon, 13 Mar 2023 13:50:38 +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 4PZyjB42B4z3t8d; Mon, 13 Mar 2023 13:50:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678715438; 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=eVh1sXocCMNLrA5ErxjbDa7mtJ+AZXqSiZb7SA+ssPE=; b=IqPTHxujwpzglJ3VAeXQwhVVRP49nSoOXpmCbtzP3BPm8zTKLN7niSHNfvFtM/dFc0aqxi YIItEeb68MCELLqbxnTgB3gmHxNM48FZ1z07K07aUr7RPkg4YUIYELWX3GcUUV62QdE7qt W0mJvqXrfn44OGI+WZbDYDOKyDFBDgeLgA1FKQQmz8eY8dYd5YFjS4wHFqf7PUiIlLNezS N+LfQY8zICqFeD/RNA3V5V32uDiTaBuZpgna38Dw6UZsSd9Z/FM5wGF0nCARsZ8Q6FXizN JCrygElGbAZNZbRHSMtxd3n6Jq4sIthRT2wkKo0YubJ7P93V3F82lwfMjINuzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678715438; 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=eVh1sXocCMNLrA5ErxjbDa7mtJ+AZXqSiZb7SA+ssPE=; b=MLs/L+EpcDvB57CbClrGf5MZKcRpHNqplb9YIHtw/LcPDynpDOGVqOfEvvXcQXtLMNOlY9 BsMuR7juE9oxS71YVYYon0ms8T+1RiaAjtJh19t34XRdzkAmenGnk5or3mvCaE/E3ysZN0 7LcKy/h2cXb4P61QUBfZcWhwR1PnE6BRzRZsS1CouAaGQF1Yri14Tqzpboq7Q1ZWWk7/80 q/S79g3xcxVc1UxrqcoJWE+dXCYGBndkTUjuQB9ptCxE4v1hwTtvATudxhaG19eqy0qL7U N8AC5jB+4ajQT8VDoiPGCocXrzsXVy8C6gyB8yFe7cO3Wupyu9JSGUjlZPrpYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678715438; a=rsa-sha256; cv=none; b=GWQcPg86/Q+jzY/TcUb6w+A7+dgcrX/lS6oFNovPUL1j64hkt2IONiFj3Q0DOz5eGynmGo lLeRG4oB7N/msH2aT0J0esCUWFVQL7ia0Ti9mxy1nqypM3gQnhdIEOCx3HNxsWcJCd/4ms EgIT2LawXCaTPLX9P6QhZO/GF3y9gu2KsnEBKzHnqzCJX6IkTzCZG+tR2b6aeL+6l4e5YT nzeNsCvUdjYYFuRYHNWUSXG/42D4cNH895JcS1D+k7dTdFC6Pok1kfdi/AoJYFscGU6fIQ /WCAQmmZdDiWRJg305qoh0GaTXtdvVnpnTn0p0GgObYdCtWwRInscibbPR7QEQ== 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 4PZyjB34vCzvl1; Mon, 13 Mar 2023 13:50:38 +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 32DDocfY036304; Mon, 13 Mar 2023 13:50:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32DDocu7036303; Mon, 13 Mar 2023 13:50:38 GMT (envelope-from git) Date: Mon, 13 Mar 2023 13:50:38 GMT Message-Id: <202303131350.32DDocu7036303@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 84f06098ef0a - main - zfs: Use .section .rodata instead of .rodata on FreeBSD 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84f06098ef0a1c7d3d385e3b5d5f8009e985f6d2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=84f06098ef0a1c7d3d385e3b5d5f8009e985f6d2 commit 84f06098ef0a1c7d3d385e3b5d5f8009e985f6d2 Author: Dimitry Andric AuthorDate: 2023-02-25 00:45:48 +0000 Commit: Mateusz Guzik CommitDate: 2023-03-13 13:48:05 +0000 zfs: Use .section .rodata instead of .rodata on FreeBSD In commit 0a5b942d4 the FreeBSD SECTION_STATIC macro was set to ".rodata". This assembler directive is supported by LLVM (as a convenience alias for ".section .rodata") by not by GNU as. This caused the FreeBSD builds that are done with gcc to fail. Therefore, use ".section .rodata" instead, similar to the other asm_linkage.h headers. [mjg: cherry-picked from upstream zfs bf1bec394e715de9f7ac4a54b5b1b884d7e41a32 to unbreak gcc12 build] Reviewed-by: Mateusz Guzik Reviewed-by: Attila Fülöp Reviewed-by: Jorgen Lundman Signed-off-by: Dimitry Andric Closes #14526 --- sys/contrib/openzfs/include/os/freebsd/spl/sys/ia32/asm_linkage.h | 2 +- .../openzfs/lib/libspl/include/os/freebsd/sys/ia32/asm_linkage.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/ia32/asm_linkage.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/ia32/asm_linkage.h index 1ebfd8350661..d1f53cf22f41 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/ia32/asm_linkage.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/ia32/asm_linkage.h @@ -36,7 +36,7 @@ #define ENDBR #define SECTION_TEXT .text -#define SECTION_STATIC .rodata +#define SECTION_STATIC .section .rodata #ifdef __cplusplus extern "C" { diff --git a/sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/ia32/asm_linkage.h b/sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/ia32/asm_linkage.h index 08c73037990f..1c4d74423644 100644 --- a/sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/ia32/asm_linkage.h +++ b/sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/ia32/asm_linkage.h @@ -40,7 +40,7 @@ #define ENDBR #define SECTION_TEXT .text -#define SECTION_STATIC .rodata +#define SECTION_STATIC .section .rodata #ifdef __cplusplus extern "C" {