diff mbox

arm64/crypto: fix makefile rule for aes-glue-%.o

Message ID 1409258814-16847-1-git-send-email-dann.frazier@canonical.com
State New
Headers show

Commit Message

dann frazier Aug. 28, 2014, 8:46 p.m. UTC 
This fixes the following build failure when building with CONFIG_MODVERSIONS
enabled:

  CC [M]  arch/arm64/crypto/aes-glue-ce.o
ld: cannot find arch/arm64/crypto/aes-glue-ce.o: No such file or directory
make[1]: *** [arch/arm64/crypto/aes-ce-blk.o] Error 1
make: *** [arch/arm64/crypto] Error 2

The $(obj)/aes-glue-%.o rule only creates $(obj)/.tmp_aes-glue-ce.o, it
should use if_changed_rule instead of if_changed_dep.

Signed-off-by: Andreas Schwab <schwab@suse.de>
[ardb: mention CONFIG_MODVERSIONS in commit log]
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from upstream 7c2105fbe9658d6cee18751568e29579bb58bfec)
[replacing non-upstream fix that was added in 5226d69]
Signed-off-by: dann frazier <dann.frazier@canonical.com>
---
 arch/arm64/crypto/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Tim Gardner Aug. 28, 2014, 11:13 p.m. UTC | #1 
I cleaned up the original carnage so that 
7c2105fbe9658d6cee18751568e29579bb58bfec was a clean cherry-pick. I had 
to do something similar for the unstable branch as well.

rtg
diff mbox

Patch

diff --git a/arch/arm64/crypto/Makefile b/arch/arm64/crypto/Makefile
index eea5315..a3f935f 100644
--- a/arch/arm64/crypto/Makefile
+++ b/arch/arm64/crypto/Makefile
@@ -35,5 +35,4 @@  AFLAGS_aes-neon.o	:= -DINTERLEAVE=4
 CFLAGS_aes-glue-ce.o	:= -DUSE_V8_CRYPTO_EXTENSIONS
 
 $(obj)/aes-glue-%.o: $(src)/aes-glue.c FORCE
-	$(call if_changed_dep,cc_o_c)
-	mv -v $(obj)/.tmp_aes-glue-$*.o $(obj)/aes-glue-$*.o
+	$(call if_changed_rule,cc_o_c)