diff options
| author | Mark Brown <broonie@kernel.org> | 2026-05-30 00:26:11 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-05-30 00:26:11 +0100 |
| commit | 30a025b7ed6a484d54893f80be414d17153d8342 (patch) | |
| tree | 2ab60da1f8ab09444b4c9a9723a57560183fa302 /crypto | |
| parent | 4a4fd953be5fd7ca9d22be8145e5c48cd7b74fae (diff) | |
| parent | cbe44c389ae80362e72696ac08f7c55a83f2a050 (diff) | |
| download | linux-next-history-30a025b7ed6a484d54893f80be414d17153d8342.tar.gz | |
Merge branch 'crc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Makefile | 10 | ||||
| -rw-r--r-- | crypto/aegis128-neon-inner.c | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/crypto/Makefile b/crypto/Makefile index c73f4d51d0368..481ee417ff446 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -103,13 +103,14 @@ obj-$(CONFIG_CRYPTO_CHACHA20POLY1305) += chacha20poly1305.o obj-$(CONFIG_CRYPTO_AEGIS128) += aegis128.o aegis128-y := aegis128-core.o +CFLAGS_aegis128-neon-inner.o += $(CC_FLAGS_FPU) +CFLAGS_REMOVE_aegis128-neon-inner.o += $(CC_FLAGS_NO_FPU) ifeq ($(ARCH),arm) -CFLAGS_aegis128-neon-inner.o += -ffreestanding -march=armv8-a -mfloat-abi=softfp -CFLAGS_aegis128-neon-inner.o += -mfpu=crypto-neon-fp-armv8 +CFLAGS_aegis128-neon-inner.o += -march=armv8-a -mfpu=crypto-neon-fp-armv8 aegis128-$(CONFIG_CRYPTO_AEGIS128_SIMD) += aegis128-neon.o aegis128-neon-inner.o endif ifeq ($(ARCH),arm64) -aegis128-cflags-y := -ffreestanding -mcpu=generic+crypto +aegis128-cflags-y := -mcpu=generic+crypto aegis128-cflags-$(CONFIG_CC_IS_GCC) += -ffixed-q16 -ffixed-q17 -ffixed-q18 \ -ffixed-q19 -ffixed-q20 -ffixed-q21 \ -ffixed-q22 -ffixed-q23 -ffixed-q24 \ @@ -117,11 +118,8 @@ aegis128-cflags-$(CONFIG_CC_IS_GCC) += -ffixed-q16 -ffixed-q17 -ffixed-q18 \ -ffixed-q28 -ffixed-q29 -ffixed-q30 \ -ffixed-q31 CFLAGS_aegis128-neon-inner.o += $(aegis128-cflags-y) -CFLAGS_REMOVE_aegis128-neon-inner.o += -mgeneral-regs-only aegis128-$(CONFIG_CRYPTO_AEGIS128_SIMD) += aegis128-neon.o aegis128-neon-inner.o endif -# Enable <arm_neon.h> -CFLAGS_aegis128-neon-inner.o += -isystem $(shell $(CC) -print-file-name=include) obj-$(CONFIG_CRYPTO_PCRYPT) += pcrypt.o obj-$(CONFIG_CRYPTO_CRYPTD) += cryptd.o diff --git a/crypto/aegis128-neon-inner.c b/crypto/aegis128-neon-inner.c index b6a52a386b220..56b534eeb6807 100644 --- a/crypto/aegis128-neon-inner.c +++ b/crypto/aegis128-neon-inner.c @@ -3,13 +3,11 @@ * Copyright (C) 2019 Linaro, Ltd. <ard.biesheuvel@linaro.org> */ -#ifdef CONFIG_ARM64 #include <asm/neon-intrinsics.h> +#ifdef CONFIG_ARM64 #define AES_ROUND "aese %0.16b, %1.16b \n\t aesmc %0.16b, %0.16b" #else -#include <arm_neon.h> - #define AES_ROUND "aese.8 %q0, %q1 \n\t aesmc.8 %q0, %q0" #endif |