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 735C63469E3; Tue, 26 Aug 2025 13:19:39 +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=1756214379; cv=none; b=r6+NF//F9wgL0vmnbea9EzWj1ICD2NB/sxeT/3cLikoHUjLG1vUp6afBAKo0zqTqY7+QnoekZGJGK5UMVgr49CQnaTdRLXRJUcpdEDQYyR06c6AWSAYMzYvvSlVhowSiIO8qwSs/IgcGn6gX5wX9+0ZYN9pLDzMcanK45A6PS0A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756214379; c=relaxed/simple; bh=OY+gRgef1mDQqTkbSusk+Nti6ETjc8YoSdXQoxKlAfU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=WEVRL9/A88n+qHqjW//WQn+mlcyg2NuKrYXypFONq7is+9Fi4lR80egNv7zNB5EOAXBsdBt/UwkeM9cBGmvRgCxJO78givdd1l5kLhUcEBVqbyygqV+QHybJ7K1in3WscNQJri+giOwsZ+p89hxmbjxGqC4VWmeeOZs0ACqDrGs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=h9x5q+RJ; 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="h9x5q+RJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D0490C4CEF1; Tue, 26 Aug 2025 13:19:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756214379; bh=OY+gRgef1mDQqTkbSusk+Nti6ETjc8YoSdXQoxKlAfU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h9x5q+RJRU3JNH/IMife5yMgp3nTrN4MEJsRezpvgAz+F74ULVnldPrscdBHlDks7 hzgK+720uZFP0Lk2mvrlsOD/RZnSew/kAa1tPpXwhtO+cW//4cYY+0YCWv7yY2Oj+g Nwr5rKsOremjSm6Kclk+fgUGE3pAHv/vzWuyhULA= 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.1 084/482] tools/build: Fix s390(x) cross-compilation with clang Date: Tue, 26 Aug 2025 13:05:37 +0200 Message-ID: <20250826110932.905361632@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110930.769259449@linuxfoundation.org> References: <20250826110930.769259449@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.1-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 0efb8f2b33ce..5607e2405a72 100644 --- a/tools/scripts/Makefile.include +++ b/tools/scripts/Makefile.include @@ -98,7 +98,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