| From 21c103208ddbcfcee16507cbee9a69621e46ddda Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 3 Dec 2025 20:08:00 +0100 |
| Subject: tools/nolibc: always use 64-bit mode for s390 header checks |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Thomas Weißschuh <linux@weissschuh.net> |
| |
| [ Upstream commit cc6809f6728456c03db6750fcc94ed8b581a2cf8 ] |
| |
| 32-bit s390 support was recently removed from nolibc. |
| If the compiler defaults to 32-bit during the header checks, they fail. |
| |
| Make sure to always use 64-bit mode for s390 heafer checks. |
| |
| Fixes: 169ebcbb9082 ("tools: Remove s390 compat support") |
| Acked-by: Willy Tarreau <w@1wt.eu> |
| Acked-by: Heiko Carstens <hca@linux.ibm.com> |
| Link: https://patch.msgid.link/20251203-nolibc-headers-check-s390-v1-1-5d35e52a83ba@weissschuh.net |
| Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/include/nolibc/Makefile | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/tools/include/nolibc/Makefile b/tools/include/nolibc/Makefile |
| index 8118e22844f19..afb6a20ac1336 100644 |
| --- a/tools/include/nolibc/Makefile |
| +++ b/tools/include/nolibc/Makefile |
| @@ -103,9 +103,12 @@ headers_standalone: headers |
| $(Q)$(MAKE) -C $(srctree) headers |
| $(Q)$(MAKE) -C $(srctree) headers_install INSTALL_HDR_PATH=$(OUTPUT)sysroot |
| |
| +CFLAGS_s390 := -m64 |
| +CFLAGS := $(CFLAGS_$(ARCH)) |
| + |
| headers_check: headers_standalone |
| $(Q)for header in $(filter-out crt.h std.h,$(all_files)); do \ |
| - $(CC) $(CLANG_CROSS_FLAGS) -Wall -Werror -nostdinc -fsyntax-only -x c /dev/null \ |
| + $(CC) $(CFLAGS) $(CLANG_CROSS_FLAGS) -Wall -Werror -nostdinc -fsyntax-only -x c /dev/null \ |
| -I$(or $(objtree),$(srctree))/usr/include -include $$header -include $$header || exit 1; \ |
| done |
| |
| -- |
| 2.51.0 |
| |
