From mboxrd@z Thu Jan 1 00:00:00 1970 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 C11BFC4332F for ; Thu, 2 Nov 2023 09:30:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345727AbjKBJaH (ORCPT ); Thu, 2 Nov 2023 05:30:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234890AbjKBJaF (ORCPT ); Thu, 2 Nov 2023 05:30:05 -0400 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD9AD139; Thu, 2 Nov 2023 02:30:02 -0700 (PDT) Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-53dfc28a2afso1110176a12.1; Thu, 02 Nov 2023 02:30:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698917401; x=1699522201; darn=vger.kernel.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:date:from:from:to :cc:subject:date:message-id:reply-to; bh=v7/woVjmU2RBJPq+smg6r80XOve4WhdwHN8IQS4+gXE=; b=GqYjmwM8c+8+Io4Yui7sSe2wTZL9kU8/7YjRVRo/liPpaRXdXYCzjqj2H9eJ8H+Nvc lCSQ8A4ajT62BV3Pg37K7jgc6BLInuHrkicEUfeGBqyf5HWSqL0dMEcEv2Qfx/9rqJ2a Ukfs7VHhZ4kS44MXE8/33v6Oz1lmYud610rvruwHVfgwbIdGPclbxOf3eq8DX8w9zXmH 6+BF7n4lCUMKEwQ2E+2gbjDvljIU/4ZfytYiO8Nu9vmo6rTvDmCy5EFbCPGs88h5MCA2 FO4hmTdFpWKYZcRVQvQZfD/6SVryAGYHlT1Lw+tJnbqD6z4cKKgCzp7aYMa05OvesyV6 UYmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698917401; x=1699522201; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=v7/woVjmU2RBJPq+smg6r80XOve4WhdwHN8IQS4+gXE=; b=u5/cPrK2OixWh39yJz700wXnZQlY9idkY5jGzvIYJpj7dCLnIcNGMcnZG+i5PXCNu6 d20mjOG+4lCuMYOgOPtIQFtqUbFkFk7NBy8xLogg3nzJ9bM03I+XDjBpYrnNbRwadgIs b5xwI681s8RqEDxPRxb5dTjSoBUAtEneslTYV0m5vHB+GMcsFgxCWc3Ag8zOZSR3+wao mHbj86ZrIqhBYKasan25D0YjvH2EkFSExgV9ByIm7amEJSNBUnEJyZHYwQW7+ZZpBppT h8hdS2Q1aQtX37OP9+abfMAPIBUWAEmqpZNNS0qdeZs89HrC7KqcaPGKqO1N9f+BEmXL gN2w== X-Gm-Message-State: AOJu0YzA+blrJKpqzfp0ooLWNdwOkX84E6n6VT8TD6BreOKdqKvqK7Zb t67tXJjTEEJkAiZZLnf5LHM= X-Google-Smtp-Source: AGHT+IHzxzXJreH8ARsObOVNO0E1iGFYPjKZEsSuxYNAATjQOicsHRAcm7e/QPrQfY6dlnivz/aKgQ== X-Received: by 2002:a17:906:fd89:b0:9ce:24d0:8a01 with SMTP id xa9-20020a170906fd8900b009ce24d08a01mr4280263ejb.60.1698917400807; Thu, 02 Nov 2023 02:30:00 -0700 (PDT) Received: from krava (2001-1ae9-1c2-4c00-726e-c10f-8833-ff22.ip6.tmcz.cz. [2001:1ae9:1c2:4c00:726e:c10f:8833:ff22]) by smtp.gmail.com with ESMTPSA id qh13-20020a170906ecad00b009b29553b648sm888874ejb.206.2023.11.02.02.29.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 02:30:00 -0700 (PDT) From: Jiri Olsa X-Google-Original-From: Jiri Olsa Date: Thu, 2 Nov 2023 10:29:58 +0100 To: =?iso-8859-1?Q?Bj=F6rn_T=F6pel?= Cc: Arnaldo Carvalho de Melo , Jean-Philippe Brucker , linux-kernel@vger.kernel.org, =?iso-8859-1?Q?Bj=F6rn_T=F6pel?= , Nathan Chancellor , Nick Desaulniers , Tom Rix , bpf@vger.kernel.org, Anders Roxell , llvm@lists.linux.dev Subject: Re: [PATCH] tools/build: Add clang cross-compilation flags to feature detection Message-ID: References: <20231102081441.240280-1-bjorn@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20231102081441.240280-1-bjorn@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Nov 02, 2023 at 09:14:41AM +0100, Björn Töpel wrote: > From: Björn Töpel > > When a tool cross-build has LLVM=1 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=riscv CROSS_COMPILE=riscv64-linux-gnu- LLVM=1 > > 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örn Töpel > --- > tools/build/Makefile.feature | 2 +- > tools/build/feature/Makefile | 8 ++++---- > 2 files changed, 5 insertions(+), 5 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 > > feature_check = $(eval $(feature_check_code)) > define feature_check_code > - feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" CXXFLAGS="$(EXTRA_CXXFLAGS) $(FEATURE_CHECK_CXXFLAGS-$(1))" LDFLAGS="$(LDFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" -C $(feature_dir) $(OUTPUT_FEATURES)test-$1.bin >/dev/null 2>/dev/null && echo 1 || echo 0) > + feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" CXXFLAGS="$(EXTRA_CXXFLAGS) $(FEATURE_CHECK_CXXFLAGS-$(1))" LDFLAGS="$(LDFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" CLANG_CROSS_FLAGS="$(CLANG_CROSS_FLAGS)" -C $(feature_dir) $(OUTPUT_FEATURES)test-$1.bin >/dev/null 2>/dev/null && echo 1 || echo 0) > endef > > feature_set = $(eval $(feature_set_code)) > diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile > index dad79ede4e0a..0231a53024c7 100644 > --- a/tools/build/feature/Makefile > +++ b/tools/build/feature/Makefile > @@ -84,12 +84,12 @@ PKG_CONFIG ?= $(CROSS_COMPILE)pkg-config > > all: $(FILES) > > -__BUILD = $(CC) $(CFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.c,$(@F)) $(LDFLAGS) > +__BUILD = $(CC) $(CFLAGS) $(CLANG_CROSS_FLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.c,$(@F)) $(LDFLAGS) > BUILD = $(__BUILD) > $(@:.bin=.make.output) 2>&1 > BUILD_BFD = $(BUILD) -DPACKAGE='"perf"' -lbfd -ldl > BUILD_ALL = $(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -lslang $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz -llzma -lzstd -lcap > > -__BUILDXX = $(CXX) $(CXXFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.cpp,$(@F)) $(LDFLAGS) > +__BUILDXX = $(CXX) $(CXXFLAGS) $(CLANG_CROSS_FLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.cpp,$(@F)) $(LDFLAGS) > BUILDXX = $(__BUILDXX) > $(@:.bin=.make.output) 2>&1 > > ############################### > @@ -259,10 +259,10 @@ $(OUTPUT)test-reallocarray.bin: > $(BUILD) > > $(OUTPUT)test-libbfd-liberty.bin: > - $(CC) $(CFLAGS) -Wall -Werror -o $@ test-libbfd.c -DPACKAGE='"perf"' $(LDFLAGS) -lbfd -ldl -liberty > + $(CC) $(CFLAGS) $(CLANG_CROSS_FLAGS) -Wall -Werror -o $@ test-libbfd.c -DPACKAGE='"perf"' $(LDFLAGS) -lbfd -ldl -liberty > > $(OUTPUT)test-libbfd-liberty-z.bin: > - $(CC) $(CFLAGS) -Wall -Werror -o $@ test-libbfd.c -DPACKAGE='"perf"' $(LDFLAGS) -lbfd -ldl -liberty -lz > + $(CC) $(CFLAGS) $(CLANG_CROSS_FLAGS) -Wall -Werror -o $@ test-libbfd.c -DPACKAGE='"perf"' $(LDFLAGS) -lbfd -ldl -liberty -lz should we add this also to test-compile-32.bin/test-compile-x32.bin targets? jirka > > $(OUTPUT)test-cplus-demangle.bin: > $(BUILD) -liberty > > base-commit: 21e80f3841c01aeaf32d7aee7bbc87b3db1aa0c6 > -- > 2.40.1 > >