From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9798EEB64DD for ; Tue, 1 Aug 2023 10:12:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=ALfGkIepNf+TBawXDHRFPAGngL6+XcetN6jc9Q7npas=; b=fvLC02rL/nWD9n DYmjsPi8Vro9uVb9YqUBWfNNf9pBH6bCil8rC+Kd7sWbyoFjBxSVOPZG9XN3DjqLr7teQNhoMYSfH 4RLXeYcZE3pQECWXvilVFxRg79B3JtwbG2+7pM8XSElYFV3aJlfAqA3bJXfgqmt0IdljDVwFskqpF rl48dVI5m5vmW9T9v+sN46c19z7PNVqtvTlPP1FN3e2Gq6AIbyibob3BGG/+dE9L+zVRfsTHgFG1H 4DKcw1qhiNzSEjfdXlllxS+RrKKiJC2emUDiEgVZq3GuNB7A6Rui085aLTj7P0RTz3KQZkp6fFfnC +36IK9ZMgV6rYaw3HUBg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qQmM9-001k0o-1G; Tue, 01 Aug 2023 10:11:57 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qQmM6-001k01-1v for linux-arm-kernel@lists.infradead.org; Tue, 01 Aug 2023 10:11:55 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B367B61519; Tue, 1 Aug 2023 10:11:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 69C32C433C9; Tue, 1 Aug 2023 10:11:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690884713; bh=Mema2WOgggjRLjdeivhOjSi5gn1KSKttjlm9f2Ugbak=; h=From:To:Cc:Subject:Date:From; b=ZtE0jhP0INdoMt0NEZyGTqVWtT5JhKgQXBsn01xmytSWej5pW6CRuPWX80pbrW4RJ r+yg86qARF+D09fxyJ9wbWW8inJt2sPUmwCyAJRKLy/euBTQAj0OMclx6Yd2OyWKYf U05nVa+gFKDcKJLFcjY6ZOQMkAHG2MLUnQnk69FZRwEixkR+PXGOPxWP4RT9A9Z4fm xxMxMmIUdRMK3PbJzn9r7zvDDkZjxXfQs983LhOH1tI2rddnUfnoGYl3OVaHhuAs0o jp999v4DdwwH1uNgZyc5VD8Cav9Mhqoe4D+winfUGGQNfh0dGFHJjY9235wGZTxhHp opxuJO8WnBq1Q== From: Masahiro Yamada To: Herbert Xu , linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Ard Biesheuvel , Masahiro Yamada , Catalin Marinas , "David S. Miller" , Will Deacon , linux-arm-kernel@lists.infradead.org Subject: [PATCH] crypto: arm64/aes: remove Makefile hack Date: Tue, 1 Aug 2023 19:11:46 +0900 Message-Id: <20230801101146.1550814-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230801_031154_704381_AC509AB1 X-CRM114-Status: GOOD ( 14.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- 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" -- 2.39.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel