From nobody Wed Dec 31 13:03:36 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C1BEC4332F for ; Thu, 2 Nov 2023 10:33:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346797AbjKBKdE (ORCPT ); Thu, 2 Nov 2023 06:33:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346832AbjKBKdC (ORCPT ); Thu, 2 Nov 2023 06:33:02 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C430AC2 for ; Thu, 2 Nov 2023 03:32:59 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22382C433C7; Thu, 2 Nov 2023 10:32:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698921179; bh=vCsEm5kYfVokXfpt6FzUVW6m+28U/AvZkO+g4Ew8jFk=; h=From:To:Cc:Subject:Date:From; b=ZJiNlDs4f9oSJYvvei6uvYrpqZq37TUCwF2TSXFU0cathgxMjUlb4jnlSBN4uWgXY h1C9FNJXF8eXE6TTbyrPdzGPap3ZvqTeBycVZLwtI/OBCUOA+yoZaqgqRt9+AtkZYO 1kJ2hdn88SArB44LpXio9JYg3HVTdQLy/72rTKqAFoB3/hWHcAVdzvxYSVIMHY/pmQ uCnjE2dRoZusENcLrLAjYtjG94rH95ydVkXdor2gNtHsd8Jh5z22QhPIQ3qx+ucgsn Hnsk6XReZPEAH78MSG8NTPZp2RwwvCPMNAXDwhxHJEM2hylphICX3Wg97UUqFLlfiL TC+p/kmOFN+ZA== From: =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= To: Arnaldo Carvalho de Melo , Jean-Philippe Brucker , linux-kernel@vger.kernel.org Cc: =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Nathan Chancellor , Nick Desaulniers , Tom Rix , bpf@vger.kernel.org, Anders Roxell , llvm@lists.linux.dev, Jiri Olsa Subject: [PATCH v2] tools/build: Add clang cross-compilation flags to feature detection Date: Thu, 2 Nov 2023 11:32:52 +0100 Message-Id: <20231102103252.247147-1-bjorn@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bj=C3=B6rn T=C3=B6pel When a tool cross-build has LLVM=3D1 set, the clang cross-compilation flags are not passed to the feature detection build system. This results in the host's features are detected instead of the targets. E.g, triggering a cross-build of bpftool: cd tools/bpf/bpftool make ARCH=3Driscv CROSS_COMPILE=3Driscv64-linux-gnu- LLVM=3D1 would report the host's, and not the target's features. Correct the issue by passing the CLANG_CROSS_FLAGS variable to the feature detection makefile. Fixes: cebdb7374577 ("tools: Help cross-building with clang") Signed-off-by: Bj=C3=B6rn T=C3=B6pel Acked-by: Jiri Olsa Reviewed-by: Jean-Philippe Brucker --- tools/build/Makefile.feature | 2 +- tools/build/feature/Makefile | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature index 934e2777a2db..25b009a6c05f 100644 --- a/tools/build/Makefile.feature +++ b/tools/build/Makefile.feature @@ -8,7 +8,7 @@ endif =20 feature_check =3D $(eval $(feature_check_code)) define feature_check_code - feature-$(1) :=3D $(shell $(MAKE) OUTPUT=3D$(OUTPUT_FEATURES) CC=3D"$(CC= )" CXX=3D"$(CXX)" CFLAGS=3D"$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" C= XXFLAGS=3D"$(EXTRA_CXXFLAGS) $(FEATURE_CHECK_CXXFLAGS-$(1))" LDFLAGS=3D"$(L= DFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" -C $(feature_dir) $(OUTPUT_FEATURES)= test-$1.bin >/dev/null 2>/dev/null && echo 1 || echo 0) + feature-$(1) :=3D $(shell $(MAKE) OUTPUT=3D$(OUTPUT_FEATURES) CC=3D"$(CC= )" CXX=3D"$(CXX)" CFLAGS=3D"$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" C= XXFLAGS=3D"$(EXTRA_CXXFLAGS) $(FEATURE_CHECK_CXXFLAGS-$(1))" LDFLAGS=3D"$(L= DFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" CLANG_CROSS_FLAGS=3D"$(CLANG_CROSS_F= LAGS)" -C $(feature_dir) $(OUTPUT_FEATURES)test-$1.bin >/dev/null 2>/dev/nu= ll && echo 1 || echo 0) endef =20 feature_set =3D $(eval $(feature_set_code)) diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile index dad79ede4e0a..c4458345e564 100644 --- a/tools/build/feature/Makefile +++ b/tools/build/feature/Makefile @@ -84,12 +84,12 @@ PKG_CONFIG ?=3D $(CROSS_COMPILE)pkg-config =20 all: $(FILES) =20 -__BUILD =3D $(CC) $(CFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.c,$= (@F)) $(LDFLAGS) +__BUILD =3D $(CC) $(CFLAGS) $(CLANG_CROSS_FLAGS) -MD -Wall -Werror -o $@ $= (patsubst %.bin,%.c,$(@F)) $(LDFLAGS) BUILD =3D $(__BUILD) > $(@:.bin=3D.make.output) 2>&1 BUILD_BFD =3D $(BUILD) -DPACKAGE=3D'"perf"' -lbfd -ldl BUILD_ALL =3D $(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=3D2 -= ldw -lelf -lnuma -lelf -lslang $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -D= PACKAGE=3D'"perf"' -lbfd -ldl -lz -llzma -lzstd -lcap =20 -__BUILDXX =3D $(CXX) $(CXXFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,= %.cpp,$(@F)) $(LDFLAGS) +__BUILDXX =3D $(CXX) $(CXXFLAGS) $(CLANG_CROSS_FLAGS) -MD -Wall -Werror -o= $@ $(patsubst %.bin,%.cpp,$(@F)) $(LDFLAGS) BUILDXX =3D $(__BUILDXX) > $(@:.bin=3D.make.output) 2>&1 =20 ############################### @@ -259,10 +259,10 @@ $(OUTPUT)test-reallocarray.bin: $(BUILD) =20 $(OUTPUT)test-libbfd-liberty.bin: - $(CC) $(CFLAGS) -Wall -Werror -o $@ test-libbfd.c -DPACKAGE=3D'"perf"' $(= LDFLAGS) -lbfd -ldl -liberty + $(CC) $(CFLAGS) $(CLANG_CROSS_FLAGS) -Wall -Werror -o $@ test-libbfd.c -D= PACKAGE=3D'"perf"' $(LDFLAGS) -lbfd -ldl -liberty =20 $(OUTPUT)test-libbfd-liberty-z.bin: - $(CC) $(CFLAGS) -Wall -Werror -o $@ test-libbfd.c -DPACKAGE=3D'"perf"' $(= LDFLAGS) -lbfd -ldl -liberty -lz + $(CC) $(CFLAGS) $(CLANG_CROSS_FLAGS) -Wall -Werror -o $@ test-libbfd.c -D= PACKAGE=3D'"perf"' $(LDFLAGS) -lbfd -ldl -liberty -lz =20 $(OUTPUT)test-cplus-demangle.bin: $(BUILD) -liberty @@ -283,10 +283,10 @@ $(OUTPUT)test-libbabeltrace.bin: $(BUILD) # -lbabeltrace provided by $(FEATURE_CHECK_LDFLAGS-libbabeltrace) =20 $(OUTPUT)test-compile-32.bin: - $(CC) -m32 -o $@ test-compile.c + $(CC) $(CLANG_CROSS_FLAGS) -m32 -o $@ test-compile.c =20 $(OUTPUT)test-compile-x32.bin: - $(CC) -mx32 -o $@ test-compile.c + $(CC) $(CLANG_CROSS_FLAGS) -mx32 -o $@ test-compile.c =20 $(OUTPUT)test-zlib.bin: $(BUILD) -lz base-commit: 21e80f3841c01aeaf32d7aee7bbc87b3db1aa0c6 --=20 2.40.1