From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F3B6127B333; Mon, 18 Aug 2025 13:22:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755523357; cv=none; b=bhBTLzLJo/F+r1RlbZl0TsF/Yrquh2HGhruLm8L4treIDpRLvDZNg8CbVHO5XYjjunfTnQ83Q4REGLi1QHjnymze00muOyf68wsYE1T/6nqNxqsIRrae+M3+A5QP1N5sGwP1hnGy9VKyfrD6jT3nqEDng6PHUhrubTNwkseNB6w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755523357; c=relaxed/simple; bh=NdDjVqzKJAX6jg8dkQgG0XYNQIONU+Bsg9H4JphIwPk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OE0/p6/yVh8F7BRgWeS6Uuyrz/VCTQj+/ngm3ajNChDh043vjBFHJ1T67rtYtopzIV0lNIaf2B4ALInUhQD7RRLSHCEFjjqTGCK0YOU1t6icBnf0pLZFclEIVl01MVC4XPc51sJYOGaMCbYaLSBBQlKOqA/nc59k+QMoFWfoLV4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SX4sjY0q; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="SX4sjY0q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27208C4CEEB; Mon, 18 Aug 2025 13:22:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755523356; bh=NdDjVqzKJAX6jg8dkQgG0XYNQIONU+Bsg9H4JphIwPk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SX4sjY0qLq4xHK4S0Ol37h1lzNch6J68UshQEmlZq/4VavKdrtGKj3UTyy6ATPE3T Hb365BNnzbERzWHUSITA0LIl/r2dIF8O8BV4lrgbmriV4AP8qFlNGNUCUxPATxeQTR zDk7Q023CeXcrd1olQiYDB6eeleCKJZVkmigpzq4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , Sasha Levin Subject: [PATCH 6.15 145/515] tools/build: Fix s390(x) cross-compilation with clang Date: Mon, 18 Aug 2025 14:42:11 +0200 Message-ID: <20250818124503.969469798@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250818124458.334548733@linuxfoundation.org> References: <20250818124458.334548733@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thomas Weißschuh [ Upstream commit a40f0cdce78be8a559ee8a85c908049c65a410b2 ] The heuristic to derive a clang target triple from a GCC one does not work for s390. GCC uses "s390-linux" while clang expects "s390x-linux" or "powerz-linux". Add an explicit override. Signed-off-by: Thomas Weißschuh Link: https://lore.kernel.org/r/20250620-tools-cross-s390-v2-1-ecda886e00e5@linutronix.de Signed-off-by: Thomas Weißschuh Signed-off-by: Sasha Levin --- tools/scripts/Makefile.include | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include index 5158250988ce..ded48263dd5e 100644 --- a/tools/scripts/Makefile.include +++ b/tools/scripts/Makefile.include @@ -101,7 +101,9 @@ else ifneq ($(CROSS_COMPILE),) # Allow userspace to override CLANG_CROSS_FLAGS to specify their own # sysroots and flags or to avoid the GCC call in pure Clang builds. ifeq ($(CLANG_CROSS_FLAGS),) -CLANG_CROSS_FLAGS := --target=$(notdir $(CROSS_COMPILE:%-=%)) +CLANG_TARGET := $(notdir $(CROSS_COMPILE:%-=%)) +CLANG_TARGET := $(subst s390-linux,s390x-linux,$(CLANG_TARGET)) +CLANG_CROSS_FLAGS := --target=$(CLANG_TARGET) GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)gcc 2>/dev/null)) ifneq ($(GCC_TOOLCHAIN_DIR),) CLANG_CROSS_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE)) -- 2.39.5