Received: by 2002:a17:90a:9103:0:0:0:0 with SMTP id k3csp11817256pjo; Thu, 2 Jan 2020 14:48:26 -0800 (PST) X-Google-Smtp-Source: APXvYqyL92RDI1qKDQfCSkIdwKEAxwTbD7mWYf43chYdZImU/OaVvnhzEa6UkTHU+KiyWOHrb3ps X-Received: by 2002:a05:6830:1e1c:: with SMTP id s28mr44217458otr.335.1578005306384; Thu, 02 Jan 2020 14:48:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1578005306; cv=none; d=google.com; s=arc-20160816; b=KZO0qFQNxKjHyPQc++8aWKac67Lq5hJ8W8lCshlpzRX4XxcU8UCAoaHWaO+HlTdTRs l3mEdPT4Qugxch2scaqf79ImTLqYw1HGQLvb7iqhUjUV4I3kYe2xpr9EyrkJ0Rakw3jA p3NAzHQ8831nmFnWQjfyauRs+bCz4dh91vNji3+0Y7hfDZcH4lKVV6vfUoXgLSnroJFk 17de+3N3rIx3vWPEWsF64d/cACq5IKbrzv3JBQz2H1s+I76+VITK//bbSBbJix8PhASg pCByZ/XI/LK5bjWJtDdkEvFlUjAZr7vKAyipuIgbU0KbwUxXQ3HUZYD8+Xhx2HvXHJo6 jvtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=452sN6vOCj9WbJBfc+AVCiKswAj2PSV+E/yYP5eZ49I=; b=db1JKjrpBO1KFKEZE7iiQyUZhtnNonhK84Dt4UDRU8+WBxuGnHlsjUNlkqqTINEzqs 5DxOYme5c8GnQDIdFjto2OakwcJXlEXz0DFERX02Lg/pj1BD1RAdFdpBEFWFu1QanxRJ aIFW5nM5UukMTI2oPyPp0W2dDXl8iFVot8no4TAHQ8/4AmqJvFlOIBp5vl9SqPuIdpXg iTEpWY7wcs4Vn9Oivb1cU5jXeGvJBVW1racfpePtrLcZ4zbHp38Y/As5CnVvBcH5DPOJ CXoZtrQKqI8WcZzIyqtuYNzfKUE14kDB74LaNddvKQwJliSC0MhrQDC2shNDEa5MJmmJ mkTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="Ck/xiuFK"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v21si35090523otf.87.2020.01.02.14.48.14; Thu, 02 Jan 2020 14:48:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="Ck/xiuFK"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730379AbgABWrG (ORCPT + 99 others); Thu, 2 Jan 2020 17:47:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:33458 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729425AbgABWaG (ORCPT ); Thu, 2 Jan 2020 17:30:06 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DF78F2253D; Thu, 2 Jan 2020 22:30:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578004205; bh=CWTDTobjhk4lmGzUAclAMiBrtvbncrKAtTkYja5rj/k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ck/xiuFKeNBF7g2RD4oCF9KUxhBbqNOVvvuR/RdWL3LMYL0v3qFoGsd+K9xpRwSWD 2BHvGHSutUDZki2IJvIYuSUYdr/dq9OCGzb2LjC1jJC637f6n7Avzmio+/tlN+krQc a7JW3kRnuqIXCo4rZYCgJWb+WlKKez70DsZJXGmM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michael Ellerman , Herbert Xu , Sasha Levin Subject: [PATCH 4.9 082/171] crypto: vmx - Avoid weird build failures Date: Thu, 2 Jan 2020 23:06:53 +0100 Message-Id: <20200102220558.334014570@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102220546.960200039@linuxfoundation.org> References: <20200102220546.960200039@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Michael Ellerman [ Upstream commit 4ee812f6143d78d8ba1399671d78c8d78bf2817c ] In the vmx crypto Makefile we assign to a variable called TARGET and pass that to the aesp8-ppc.pl and ghashp8-ppc.pl scripts. The variable is meant to describe what flavour of powerpc we're building for, eg. either 32 or 64-bit, and big or little endian. Unfortunately TARGET is a fairly common name for a make variable, and if it happens that TARGET is specified as a command line parameter to make, the value specified on the command line will override our value. In particular this can happen if the kernel Makefile is driven by an external Makefile that uses TARGET for something. This leads to weird build failures, eg: nonsense at /build/linux/drivers/crypto/vmx/ghashp8-ppc.pl line 45. /linux/drivers/crypto/vmx/Makefile:20: recipe for target 'drivers/crypto/vmx/ghashp8-ppc.S' failed Which shows that we passed an empty value for $(TARGET) to the perl script, confirmed with make V=1: perl /linux/drivers/crypto/vmx/ghashp8-ppc.pl > drivers/crypto/vmx/ghashp8-ppc.S We can avoid this confusion by using override, to tell make that we don't want anything to override our variable, even a value specified on the command line. We can also use a less common name, given the script calls it "flavour", let's use that. Signed-off-by: Michael Ellerman Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/vmx/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/vmx/Makefile b/drivers/crypto/vmx/Makefile index de6e241b0866..957377c309a9 100644 --- a/drivers/crypto/vmx/Makefile +++ b/drivers/crypto/vmx/Makefile @@ -2,13 +2,13 @@ obj-$(CONFIG_CRYPTO_DEV_VMX_ENCRYPT) += vmx-crypto.o vmx-crypto-objs := vmx.o aesp8-ppc.o ghashp8-ppc.o aes.o aes_cbc.o aes_ctr.o aes_xts.o ghash.o ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y) -TARGET := linux-ppc64le +override flavour := linux-ppc64le else -TARGET := linux-ppc64 +override flavour := linux-ppc64 endif quiet_cmd_perl = PERL $@ - cmd_perl = $(PERL) $(<) $(TARGET) > $(@) + cmd_perl = $(PERL) $(<) $(flavour) > $(@) $(src)/aesp8-ppc.S: $(src)/aesp8-ppc.pl $(call cmd,perl) -- 2.20.1