Skip to content

Commit

Permalink
fix for aarch64 on 6.1
Browse files Browse the repository at this point in the history
Signed-off-by: Sebastian Gottschall <[email protected]>
  • Loading branch information
BrainSlayer committed Oct 1, 2023
1 parent 43fafeb commit bec9235
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions module/Kbuild.in
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,19 @@ asflags-y := $(ZFS_MODULE_CFLAGS) $(ZFS_MODULE_CPPFLAGS)
ccflags-y := $(ZFS_MODULE_CFLAGS) $(ZFS_MODULE_CPPFLAGS)

ifeq ($(CONFIG_ARM64),y)

CFLAGS_REMOVE_zfs/zfs_fletcher_aarch64_neon.o = -mgeneral-regs-only
CFLAGS_REMOVE_zfs/vdev_raidz_math_aarch64_neon.o = -mgeneral-regs-only
CFLAGS_REMOVE_zfs/vdev_raidz_math_aarch64_neonx2.o = -mgeneral-regs-only

CFLAGS_REMOVE_zcommon/zfs_fletcher_aarch64_neon.o = -mgeneral-regs-only
CFLAGS_REMOVE_zcommon/vdev_raidz_math_aarch64_neon.o = -mgeneral-regs-only
CFLAGS_REMOVE_zcommon/vdev_raidz_math_aarch64_neonx2.o = -mgeneral-regs-only

CFLAGS_REMOVE_zfs_fletcher_aarch64_neon.o = -mgeneral-regs-only
CFLAGS_REMOVE_vdev_raidz_math_aarch64_neon.o = -mgeneral-regs-only
CFLAGS_REMOVE_vdev_raidz_math_aarch64_neonx2.o = -mgeneral-regs-only

endif

# Suppress unused-value warnings in sparc64 architecture headers
Expand Down Expand Up @@ -489,8 +499,10 @@ zfs-objs += $(addprefix zfs/,$(ZFS_OBJS)) $(addprefix os/linux/zfs/,$
zfs-$(CONFIG_X86) += $(addprefix zfs/,$(ZFS_OBJS_X86))
zfs-$(CONFIG_UML_X86)+= $(addprefix zfs/,$(ZFS_OBJS_X86))
zfs-$(CONFIG_ARM64) += $(addprefix zfs/,$(ZFS_OBJS_ARM64))
ifeq ($(CONFIG_ALTIVEC),y)
zfs-$(CONFIG_PPC) += $(addprefix zfs/,$(ZFS_OBJS_PPC_PPC64))
zfs-$(CONFIG_PPC64) += $(addprefix zfs/,$(ZFS_OBJS_PPC_PPC64))
endif

# Suppress incorrect warnings from versions of objtool which are not
# aware of x86 EVEX prefix instructions used for AVX512.
Expand Down

0 comments on commit bec9235

Please sign in to comment.