git: eb1b6ec7a79a - main - zfs: emit .note.GNU-stack section for all ELF targets

The branch main has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=eb1b6ec7a79aff05f5f10e1d6b1c63a0d8dc5f2f

commit eb1b6ec7a79aff05f5f10e1d6b1c63a0d8dc5f2f
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2026-01-08 08:35:13 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2026-01-08 08:51:36 +0000

    zfs: emit .note.GNU-stack section for all ELF targets
    
    On FreeBSD, linking the zfs kernel module with binutils ld 2.44 shows
    the following warning:
    
        ld: warning: aesni-gcm-avx2-vaes.o: missing .note.GNU-stack section implies executable stack
        ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
    
    Some of the `.S` files under `module/icp/asm-x86_64/modes` check whether
    to emit the `.note.GNU-stack` section using:
    
        #if defined(__linux__) && defined(__ELF__)
    
    We could add `&& defined(__FreeBSD__)` to the test, but since all other
    `.S` files in the OpenZFS tree use:
    
        #ifdef __ELF__
    
    it would seem more logical to use that instead. Any recent ELF platform
    should support these note sections by now.
    
    Reviewed by:    emaste, kib, imp
    MFC after:      3 days
    Differential Revision: https://reviews.freebsd.org/D54578
---
 sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-avx2-vaes.S | 2 +-
 sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-x86_64.S    | 2 +-
 sys/contrib/openzfs/module/icp/asm-x86_64/modes/ghash-x86_64.S        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-avx2-vaes.S b/sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-avx2-vaes.S
index 3d1b045127e2..76ced8ebad3d 100644
--- a/sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-avx2-vaes.S
+++ b/sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-avx2-vaes.S
@@ -1316,7 +1316,7 @@ SET_SIZE(aes_gcm_dec_update_vaes_avx2)
 #endif /* !_WIN32 || _KERNEL */
 
 /* Mark the stack non-executable. */
-#if defined(__linux__) && defined(__ELF__)
+#ifdef __ELF__
 .section .note.GNU-stack,"",%progbits
 #endif
 
diff --git a/sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-x86_64.S b/sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-x86_64.S
index 49671f1fc46a..2e0a88ec8cef 100644
--- a/sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-x86_64.S
+++ b/sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-x86_64.S
@@ -1275,7 +1275,7 @@ SECTION_STATIC
 #endif
 
 /* Mark the stack non-executable. */
-#if defined(__linux__) && defined(__ELF__)
+#ifdef __ELF__
 .section .note.GNU-stack,"",%progbits
 #endif
 
diff --git a/sys/contrib/openzfs/module/icp/asm-x86_64/modes/ghash-x86_64.S b/sys/contrib/openzfs/module/icp/asm-x86_64/modes/ghash-x86_64.S
index 319caa4e190b..6c5bbf0fb272 100644
--- a/sys/contrib/openzfs/module/icp/asm-x86_64/modes/ghash-x86_64.S
+++ b/sys/contrib/openzfs/module/icp/asm-x86_64/modes/ghash-x86_64.S
@@ -714,7 +714,7 @@ SET_OBJ(.Lrem_8bit)
 .balign	64
 
 /* Mark the stack non-executable. */
-#if defined(__linux__) && defined(__ELF__)
+#ifdef __ELF__
 .section .note.GNU-stack,"",%progbits
 #endif