Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp13468631ybl; Sun, 29 Dec 2019 12:37:09 -0800 (PST) X-Google-Smtp-Source: APXvYqyZGFtadoRrRRnOYZKpoVfHTeUhfgRI8cNluBTNfpBBucl6qH5rt1h2GMc58A5sQ5JylXUg X-Received: by 2002:a9d:12a8:: with SMTP id g37mr25410816otg.261.1577651829367; Sun, 29 Dec 2019 12:37:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577651829; cv=none; d=google.com; s=arc-20160816; b=d1eJEGb9cUqql80cXTKVAu4ZarC11LlDqMVoGY802qHXNqhK503TrcFX9e3GGxS4vB BQrYR35MkzBFY+35k3WhZqKaprEL/ZLNz7gmArsVJ6EqBEBLkunjAWRvV8slMGPjV18C GS1tzc/pj7SU44zmmq3caP++Jr9GIeo/nS7neIMN1+smqdvMQsCSuZt3/7zZ4t6QJ26K yeybMY7QvdvV7X2VgS91ScAl32tnf2CzMLTkdo5L0YeVAc0Pdfi8IcGFjaj3VzYP+Sva UkehWR/cz7ejinrXw6ztv8KYTy1HYihV3pyt8ixniEFZc+NFot5B5r3ka1qtSF/jkHGl X62A== 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=K73pU0aWnuyOLsGv/C5J0GA7LtvFlsE8OWA+SJCYDDSPaBvH4DEk9UJSKcskIT64NW PfvXvhhLIBsnrdKvaRDxZSIG4KVbKlD29n6ylLMr0h8y0raKjf7mCX77+NxHWRKt+8Ce qxOQ+7wkjDhKaYsb2Ph+YV3tqS0K0n+y0uZKmFGvoZX+XK7n3wT3mSALCFdb8Xw+6KKO CFjvm09nrO/VlvngmKlOa6r2rDxHP6MTNRWJscRkgrvx7tmUaE9ejms0tav1PPWYzcTp VMhTyM3WsQZ31XtYrTl2Oy4py4xV1C39GUVG/2CFZuV3dMLMiBs/abGH/cmnvjuDWl4a CKxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=PlVJkuki; 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 a10si6178125oid.84.2019.12.29.12.36.58; Sun, 29 Dec 2019 12:37:09 -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=PlVJkuki; 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 S1729787AbfL2Rez (ORCPT + 99 others); Sun, 29 Dec 2019 12:34:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:38602 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729166AbfL2Rex (ORCPT ); Sun, 29 Dec 2019 12:34:53 -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 74F6620409; Sun, 29 Dec 2019 17:34:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577640893; bh=aai5ilbyK01aPMcM1RzUPG+VItremKQRclN3Rtnusxo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PlVJkuki/Vh016YbuOb27aH+0VtEk1fajWjgv14e/R3kIWTe9QNhjUfokk+Be5+8C TV5ydXX2eHnN/3p/LXpQmFJ+o/FjI6RBV/qIvt95/8SJ3AUeBleiNQhTQoSe1lfLnG Sken+SCZO3wSUjMN9Tbt3+UaOsERhVJHi48HscKo= 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.19 183/219] crypto: vmx - Avoid weird build failures Date: Sun, 29 Dec 2019 18:19:45 +0100 Message-Id: <20191229162536.709177179@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229162508.458551679@linuxfoundation.org> References: <20191229162508.458551679@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