| Message ID | 20230801101146.1550814-1-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | crypto: arm64/aes: remove Makefile hack | expand |
On Tue, Aug 01, 2023 at 07:11:46PM +0900, Masahiro Yamada wrote: > Do it more simiply. This also fixes single target builds. > > [before] > > $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- arch/arm64/crypto/aes-glue-ce.i > [snip] > make[4]: *** No rule to make target 'arch/arm64/crypto/aes-glue-ce.i'. Stop. > > [after] > > $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- arch/arm64/crypto/aes-glue-ce.i > [snip] > CPP arch/arm64/crypto/aes-glue-ce.i > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > arch/arm64/crypto/Makefile | 5 ----- > arch/arm64/crypto/aes-glue-ce.c | 2 ++ > arch/arm64/crypto/aes-glue-neon.c | 1 + > 3 files changed, 3 insertions(+), 5 deletions(-) > create mode 100644 arch/arm64/crypto/aes-glue-ce.c > create mode 100644 arch/arm64/crypto/aes-glue-neon.c > > diff --git a/arch/arm64/crypto/Makefile b/arch/arm64/crypto/Makefile > index 4818e204c2ac..fbe64dce66e0 100644 > --- a/arch/arm64/crypto/Makefile > +++ b/arch/arm64/crypto/Makefile > @@ -81,11 +81,6 @@ aes-arm64-y := aes-cipher-core.o aes-cipher-glue.o > obj-$(CONFIG_CRYPTO_AES_ARM64_BS) += aes-neon-bs.o > aes-neon-bs-y := aes-neonbs-core.o aes-neonbs-glue.o > > -CFLAGS_aes-glue-ce.o := -DUSE_V8_CRYPTO_EXTENSIONS > - > -$(obj)/aes-glue-%.o: $(src)/aes-glue.c FORCE > - $(call if_changed_rule,cc_o_c) > - > quiet_cmd_perlasm = PERLASM $@ > cmd_perlasm = $(PERL) $(<) void $(@) > > diff --git a/arch/arm64/crypto/aes-glue-ce.c b/arch/arm64/crypto/aes-glue-ce.c > new file mode 100644 > index 000000000000..7d309ceeddf3 > --- /dev/null > +++ b/arch/arm64/crypto/aes-glue-ce.c > @@ -0,0 +1,2 @@ > +#define USE_V8_CRYPTO_EXTENSIONS > +#include "aes-glue.c" > diff --git a/arch/arm64/crypto/aes-glue-neon.c b/arch/arm64/crypto/aes-glue-neon.c > new file mode 100644 > index 000000000000..8ba046321064 > --- /dev/null > +++ b/arch/arm64/crypto/aes-glue-neon.c > @@ -0,0 +1 @@ > +#include "aes-glue.c" Acked-by: Will Deacon <will@kernel.org> I'm assuming Herbert will pick this up, but please let me know if I should take it instead. Will
On Tue, Aug 01, 2023 at 07:11:46PM +0900, Masahiro Yamada wrote: > Do it more simiply. This also fixes single target builds. > > [before] > > $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- arch/arm64/crypto/aes-glue-ce.i > [snip] > make[4]: *** No rule to make target 'arch/arm64/crypto/aes-glue-ce.i'. Stop. > > [after] > > $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- arch/arm64/crypto/aes-glue-ce.i > [snip] > CPP arch/arm64/crypto/aes-glue-ce.i > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > arch/arm64/crypto/Makefile | 5 ----- > arch/arm64/crypto/aes-glue-ce.c | 2 ++ > arch/arm64/crypto/aes-glue-neon.c | 1 + > 3 files changed, 3 insertions(+), 5 deletions(-) > create mode 100644 arch/arm64/crypto/aes-glue-ce.c > create mode 100644 arch/arm64/crypto/aes-glue-neon.c Patch applied. Thanks.
diff --git a/arch/arm64/crypto/Makefile b/arch/arm64/crypto/Makefile index 4818e204c2ac..fbe64dce66e0 100644 --- a/arch/arm64/crypto/Makefile +++ b/arch/arm64/crypto/Makefile @@ -81,11 +81,6 @@ aes-arm64-y := aes-cipher-core.o aes-cipher-glue.o obj-$(CONFIG_CRYPTO_AES_ARM64_BS) += aes-neon-bs.o aes-neon-bs-y := aes-neonbs-core.o aes-neonbs-glue.o -CFLAGS_aes-glue-ce.o := -DUSE_V8_CRYPTO_EXTENSIONS - -$(obj)/aes-glue-%.o: $(src)/aes-glue.c FORCE - $(call if_changed_rule,cc_o_c) - quiet_cmd_perlasm = PERLASM $@ cmd_perlasm = $(PERL) $(<) void $(@) diff --git a/arch/arm64/crypto/aes-glue-ce.c b/arch/arm64/crypto/aes-glue-ce.c new file mode 100644 index 000000000000..7d309ceeddf3 --- /dev/null +++ b/arch/arm64/crypto/aes-glue-ce.c @@ -0,0 +1,2 @@ +#define USE_V8_CRYPTO_EXTENSIONS +#include "aes-glue.c" diff --git a/arch/arm64/crypto/aes-glue-neon.c b/arch/arm64/crypto/aes-glue-neon.c new file mode 100644 index 000000000000..8ba046321064 --- /dev/null +++ b/arch/arm64/crypto/aes-glue-neon.c @@ -0,0 +1 @@ +#include "aes-glue.c"
Do it more simiply. This also fixes single target builds. [before] $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- arch/arm64/crypto/aes-glue-ce.i [snip] make[4]: *** No rule to make target 'arch/arm64/crypto/aes-glue-ce.i'. Stop. [after] $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- arch/arm64/crypto/aes-glue-ce.i [snip] CPP arch/arm64/crypto/aes-glue-ce.i Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- arch/arm64/crypto/Makefile | 5 ----- arch/arm64/crypto/aes-glue-ce.c | 2 ++ arch/arm64/crypto/aes-glue-neon.c | 1 + 3 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 arch/arm64/crypto/aes-glue-ce.c create mode 100644 arch/arm64/crypto/aes-glue-neon.c