Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp13387877ybl; Sun, 29 Dec 2019 10:40:48 -0800 (PST) X-Google-Smtp-Source: APXvYqz//HbwyM5aQ8343qVuCCbAezbe6BNonuYMVkIoo/6zO/WeP5R01sb+xzdTs7mgBzXrgvH1 X-Received: by 2002:a9d:784b:: with SMTP id c11mr66202351otm.246.1577644848425; Sun, 29 Dec 2019 10:40:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577644848; cv=none; d=google.com; s=arc-20160816; b=rOJMOyb7JBhwHoidy2E9dODsT3gbKXCfUKNodiln51f0ejvJJvcOj/BckgcpOEYe5b WTHwwuaPoyXfpSZ5IteapYy7D3odw9unLg60piYagBPW8IPzoAtE3dJtKOf4eHRgJMxV 1NRPiMY5BDy1IU4QF6n6ixD4AwyWdr6HorVYU3JuTP8VylL6YeuCxFAdLtN3ZmmDhm7y HnHRGLNfNewCxc13o+1+czmenOlEQ7J8QlX2KXRCvLlXLUKGCCvhsaJkvN/bBRi3tPtl Mc8/hrnYbqnPIAfsheGeUrBJCRFeilr0vqVH/h16hm5IQLzrYNQyPOg+d83UFZlOwsZD 3Jpw== 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=Ei4Q5KPPTGj+TgwpQxnEMr8YiJ31Xv6JWtgH0xT+6hQ=; b=OkzHb8u8iGIjY1jRyjRZCdg11KCd9klEct/vJXI3I2+yaqExULrl1J0i1jJkBLqgy3 mH+HxEU8Jv62C06PWReF/aYW6b+TEjMh2wQaRqE7vnD7ZEjTwGpFz6OeZ3eD013jE/eO ToBas1s5oevwyrKHfO98AVoviCWQaIVqqqmYqUgp4DnztY3B7MbAgGRHwWdNjEUjla6i ZM16iSapAhnxb4Nh9Ex/luG2jsM8V2nKEmun7dwmsIu/o6RelQAV1OrKtVAVH2iyoBwb dB3gDUk1Qf5d6Y3QZCBH5xUJunXEvV/zWk1JVqRtwxHGsqFbLBQT8RR/WTZnCQLN0nJp fyeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WAlaKBx+; 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 v3si18866041oif.122.2019.12.29.10.40.37; Sun, 29 Dec 2019 10:40:48 -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=WAlaKBx+; 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 S1728151AbfL2R0P (ORCPT + 99 others); Sun, 29 Dec 2019 12:26:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:46994 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728123AbfL2R0N (ORCPT ); Sun, 29 Dec 2019 12:26:13 -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 B67A220409; Sun, 29 Dec 2019 17:26:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577640373; bh=aai5ilbyK01aPMcM1RzUPG+VItremKQRclN3Rtnusxo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WAlaKBx+m04jwShOc2Bb1Jk+dvcr6qd0dHVZShIAtDova2UMz1zy1dDZqmkO1riWo AN9ANzKza+1J1rVpxZFka61VNQXsmDqxwu19kIkBiaAB4oZJ/psktp21/bXaP6KNKL wjwjHVZeee4Vi6jvpW78BgCcYnl5s81SYbf0RB5E= 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.14 132/161] crypto: vmx - Avoid weird build failures Date: Sun, 29 Dec 2019 18:19:40 +0100 Message-Id: <20191229162439.074609743@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229162355.500086350@linuxfoundation.org> References: <20191229162355.500086350@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 cab32cfec9c4..709670d2b553 100644 --- a/drivers/crypto/vmx/Makefile +++ b/drivers/crypto/vmx/Makefile @@ -3,13 +3,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) > $(@) targets += aesp8-ppc.S ghashp8-ppc.S -- 2.20.1