From nobody Wed Apr 15 21:32:52 2026 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 8343AC433FE for ; Tue, 22 Nov 2022 00:12:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232047AbiKVAL7 (ORCPT ); Mon, 21 Nov 2022 19:11:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229639AbiKVALu (ORCPT ); Mon, 21 Nov 2022 19:11:50 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 241D6B4806 for ; Mon, 21 Nov 2022 16:11:50 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id e15-20020a5b0ccf000000b006ed1704b40cso2811850ybr.5 for ; Mon, 21 Nov 2022 16:11:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=YA3p4eZ27kBAmptCpOS+nsvy69bweIx+1O3zQnoMBQo=; b=qIcwx0y/rn5zB6cQ9qMsMkZjvI5gpRES2VmQc7R5/U0FH5cNytRN8b6HgZWP3lqmhc 3L11/ejja/s1KmjigNlyciVn59RY0Tzyx4JFjENh/0tSrdO7la6uMQQ8fYABbxTF1cpP g2Z2Be+xQdwbxhEQ7k8eTL1ABOQIOxL4R/CclCu1ZWnwkXM62+Uxy+O97ODM1T+MYf5k QLbEfwwu37ZtEy//NZ/93+KtTDebZ9CYFqXpucRX5IthEnNuoaywD6RGBzV0Q/sbY2sk gsEmMRnRuI9fa4JFwG1mu7Jpzq7Qt6+e7rBI0VNZHyaiZjsDYdavm5iF0NnMdBOrHWaW eybQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YA3p4eZ27kBAmptCpOS+nsvy69bweIx+1O3zQnoMBQo=; b=IsNlvQTLh2m+XAUy4T15YOPG+UoNBqKnC5vwxGini7tuTkQcaiHd1A4H+sWFrXeBQ6 r8iM5TWDuAmIjtp8Pti7oM7tze7CSbnMcap6v95mWWL2HRxT3BH/g6m/tT4EMyd5FX9p /r8/UqM0IX8aFG+PxmJpSeeC0LgMKfS/OoqXIcYsj7bWruH5R05yELxDV7GtDmUMlcxM TqQBd7EdVF25QPVb25+l9IReS6ak53dPZElOl/47Hz8mOhQpvIi/gLRXk6uWxVQhVeyj p/xB823ZDgSUiht1sJd5yAJpZ/YXKeX1cTVcwiysCnDPcU1DYSsByENVjzGnpJfE7iAM qbYQ== X-Gm-Message-State: ANoB5pmGNfdF57Sk7DnHcefplmQ7GAiEL7oeBgInuWh8b8CkW8K/Cani 2dan4LDqsAUiNrIlN8Qwlg9MP5zgjyzY X-Google-Smtp-Source: AA0mqf4BS0Iplv3tMhM7diNXfnB9SxiuAIYsorqowoyPYfBWehAFmqEcsHlkfrTUVGaCpAGr/FkEYsE5ydyS X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:2107:a1f5:8582:5608]) (user=irogers job=sendgmr) by 2002:a25:4288:0:b0:6dd:39f6:da9 with SMTP id p130-20020a254288000000b006dd39f60da9mr10107180yba.509.1669075909376; Mon, 21 Nov 2022 16:11:49 -0800 (PST) Date: Mon, 21 Nov 2022 16:11:22 -0800 In-Reply-To: <20221122001125.765003-1-irogers@google.com> Message-Id: <20221122001125.765003-2-irogers@google.com> Mime-Version: 1.0 References: <20221122001125.765003-1-irogers@google.com> X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog Subject: [PATCH v2 1/4] tools lib subcmd: Add install target From: Ian Rogers To: Josh Poimboeuf , Peter Zijlstra , Nathan Chancellor , Nick Desaulniers , Tom Rix , Masahiro Yamada , Nicolas Schier , linux-kernel@vger.kernel.org, llvm@lists.linux.dev Cc: Stephane Eranian , Andrii Nakryiko , Jiri Olsa , Arnaldo Carvalho de Melo , Namhyung Kim , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This allows libsubcmd to be installed as a dependency. Signed-off-by: Ian Rogers Reviewed-by: Nick Desaulniers Tested-by: Nick Desaulniers --- tools/lib/subcmd/Makefile | 49 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/tools/lib/subcmd/Makefile b/tools/lib/subcmd/Makefile index 8f1a09cdfd17..e96566f8991c 100644 --- a/tools/lib/subcmd/Makefile +++ b/tools/lib/subcmd/Makefile @@ -17,6 +17,15 @@ RM =3D rm -f =20 MAKEFLAGS +=3D --no-print-directory =20 +INSTALL =3D install + +# Use DESTDIR for installing into a different root directory. +# This is useful for building a package. The program will be +# installed in this directory as if it was the root directory. +# Then the build tool can move it later. +DESTDIR ?=3D +DESTDIR_SQ =3D '$(subst ','\'',$(DESTDIR))' + LIBFILE =3D $(OUTPUT)libsubcmd.a =20 CFLAGS :=3D -ggdb3 -Wall -Wextra -std=3Dgnu99 -fPIC @@ -48,6 +57,18 @@ CFLAGS +=3D $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) =20 SUBCMD_IN :=3D $(OUTPUT)libsubcmd-in.o =20 +ifeq ($(LP64), 1) + libdir_relative =3D lib64 +else + libdir_relative =3D lib +endif + +prefix ?=3D +libdir =3D $(prefix)/$(libdir_relative) + +# Shell quotes +libdir_SQ =3D $(subst ','\'',$(libdir)) + all: =20 export srctree OUTPUT CC LD CFLAGS V @@ -61,6 +82,34 @@ $(SUBCMD_IN): FORCE $(LIBFILE): $(SUBCMD_IN) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(SUBCMD_IN) =20 +define do_install_mkdir + if [ ! -d '$(DESTDIR_SQ)$1' ]; then \ + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$1'; \ + fi +endef + +define do_install + if [ ! -d '$(DESTDIR_SQ)$2' ]; then \ + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \ + fi; \ + $(INSTALL) $1 $(if $3,-m $3,) '$(DESTDIR_SQ)$2' +endef + +install_lib: $(LIBFILE) + $(call QUIET_INSTALL, $(LIBFILE)) \ + $(call do_install_mkdir,$(libdir_SQ)); \ + cp -fpR $(LIBFILE) $(DESTDIR)$(libdir_SQ) + +install_headers: + $(call QUIET_INSTALL, headers) \ + $(call do_install,exec-cmd.h,$(prefix)/include/subcmd,644); \ + $(call do_install,help.h,$(prefix)/include/subcmd,644); \ + $(call do_install,pager.h,$(prefix)/include/subcmd,644); \ + $(call do_install,parse-options.h,$(prefix)/include/subcmd,644); \ + $(call do_install,run-command.h,$(prefix)/include/subcmd,644); + +install: install_lib install_headers + clean: $(call QUIET_CLEAN, libsubcmd) $(RM) $(LIBFILE); \ find $(or $(OUTPUT),.) -name \*.o -or -name \*.o.cmd -or -name \*.o.d | x= args $(RM) --=20 2.38.1.584.g0f3c55d4c2-goog From nobody Wed Apr 15 21:32:52 2026 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 0C188C433FE for ; Tue, 22 Nov 2022 00:12:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232180AbiKVAMU (ORCPT ); Mon, 21 Nov 2022 19:12:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232089AbiKVAMC (ORCPT ); Mon, 21 Nov 2022 19:12:02 -0500 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01427BA593 for ; Mon, 21 Nov 2022 16:11:58 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-391842a55d6so117595027b3.0 for ; Mon, 21 Nov 2022 16:11:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=GoR0XfyfLKOGrF4aZi9U/Y5nI4Wyasyd+UL78gHDN8Q=; b=lNTU/PzLJsqM2jLMTKBPrA4eAqGQHrDPAkxlfcHQm+r1wj/z9o8rIwqKYDLjoNXHkb YgSSO/lwGMoBnf+CYYg0UW5j5tawIogVOlSJfAAH5Ltv3ED+3MiK5Nq+bjSctz/TRcz8 +3A2cr1oQR77bin4jeqYK33MIxQD/Aamnq8P62owl5JUyRW38kLK8Am6EETziPSZIGhV Xx89fZ76t9YtTJKjTev19Th4JzJ93Q1Ht35I2ESNs3JlEH59PZCxLnrycIA7MjxG6P8X Vpg4uh86bV4ncCmkEPeRQlmid6Jv9G/nGNDqdeGbH9wCt1LUeifTLuFKBwFnlwowNOxl CboA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=GoR0XfyfLKOGrF4aZi9U/Y5nI4Wyasyd+UL78gHDN8Q=; b=YAOIfcMYkod7SKqmH6BxYVykYtIAfxbshLzpMfxEDVN5DljETMxvaXN3/zdueEanSB dOvkzoFJ2BmtwEySjiozCQgTAz3ZZQpQlqS4FTdMuAPUdqb3epxTHG6dOpMWPRReXwXY CfOvsdFRzYdZNYGNSv2yCuJ6ZnnXnBsHUX/JATjlliasMGkuyyRbhl66eAfcslDyP4CF 7Xh+awKeKdQ/YmwXSL4jHLYRe0UgHE0ctLGsFOJknxdNnYGuzo0+gPFoAz3NLqpri7oe JmQO2KvKoynLe/cJi2EAmIh4fepzmRp2EMv/vn753erU0Yiy2cVWn8QaGSlsC/FSJrig D6fA== X-Gm-Message-State: ANoB5pm70pOZy5/aTCJdp88uRknR8qEKGsLJC+gWZ6eivhsrLm6+JOxi IxxMyQnosAYZ7jWNyvDFctR9t1ESZA7C X-Google-Smtp-Source: AA0mqf4SrzMXmVST+smv+524H2udDqJCIC5//wnDbOgTZY3XPJzTN9VR4nBD5LfsvRKqjWiK5iJg9wJjpnMk X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:2107:a1f5:8582:5608]) (user=irogers job=sendgmr) by 2002:a25:2e0e:0:b0:6cc:35b9:8525 with SMTP id u14-20020a252e0e000000b006cc35b98525mr5139616ybu.104.1669075917318; Mon, 21 Nov 2022 16:11:57 -0800 (PST) Date: Mon, 21 Nov 2022 16:11:23 -0800 In-Reply-To: <20221122001125.765003-1-irogers@google.com> Message-Id: <20221122001125.765003-3-irogers@google.com> Mime-Version: 1.0 References: <20221122001125.765003-1-irogers@google.com> X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog Subject: [PATCH v2 2/4] objtool: Install libsubcmd in build From: Ian Rogers To: Josh Poimboeuf , Peter Zijlstra , Nathan Chancellor , Nick Desaulniers , Tom Rix , Masahiro Yamada , Nicolas Schier , linux-kernel@vger.kernel.org, llvm@lists.linux.dev Cc: Stephane Eranian , Andrii Nakryiko , Jiri Olsa , Arnaldo Carvalho de Melo , Namhyung Kim , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Including from tools/lib can create inadvertent dependencies. Install libsubcmd in the objtool build and then include the headers from there. Signed-off-by: Ian Rogers Reviewed-by: Nick Desaulniers Tested-by: Nick Desaulniers --- tools/objtool/Build | 2 -- tools/objtool/Makefile | 33 +++++++++++++++++++++++++-------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/tools/objtool/Build b/tools/objtool/Build index 33f2ee5a46d3..a3cdf8af6635 100644 --- a/tools/objtool/Build +++ b/tools/objtool/Build @@ -16,8 +16,6 @@ objtool-y +=3D libctype.o objtool-y +=3D str_error_r.o objtool-y +=3D librbtree.o =20 -CFLAGS +=3D -I$(srctree)/tools/lib - $(OUTPUT)libstring.o: ../lib/string.c FORCE $(call rule_mkdir) $(call if_changed_dep,cc_o_c) diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile index a3a9cc24e0e3..fd9b3e3113c6 100644 --- a/tools/objtool/Makefile +++ b/tools/objtool/Makefile @@ -12,9 +12,15 @@ srctree :=3D $(patsubst %/,%,$(dir $(CURDIR))) srctree :=3D $(patsubst %/,%,$(dir $(srctree))) endif =20 -SUBCMD_SRCDIR =3D $(srctree)/tools/lib/subcmd/ -LIBSUBCMD_OUTPUT =3D $(or $(OUTPUT),$(CURDIR)/) -LIBSUBCMD =3D $(LIBSUBCMD_OUTPUT)libsubcmd.a +LIBSUBCMD_DIR =3D $(srctree)/tools/lib/subcmd/ +ifneq ($(OUTPUT),) + LIBSUBCMD_OUTPUT =3D $(abspath $(OUTPUT))/libsubcmd +else + LIBSUBCMD_OUTPUT =3D $(CURDIR)/libsubcmd +endif +LIBSUBCMD_DESTDIR =3D $(LIBSUBCMD_OUTPUT) +LIBSUBCMD =3D $(LIBSUBCMD_OUTPUT)/libsubcmd.a +CFLAGS +=3D -I$(LIBSUBCMD_OUTPUT)/include =20 OBJTOOL :=3D $(OUTPUT)objtool OBJTOOL_IN :=3D $(OBJTOOL)-in.o @@ -28,7 +34,8 @@ INCLUDES :=3D -I$(srctree)/tools/include \ -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \ -I$(srctree)/tools/arch/$(SRCARCH)/include \ -I$(srctree)/tools/objtool/include \ - -I$(srctree)/tools/objtool/arch/$(SRCARCH)/include + -I$(srctree)/tools/objtool/arch/$(SRCARCH)/include \ + -I$(LIBSUBCMD_OUTPUT)/include WARNINGS :=3D $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-= packed -Wno-nested-externs CFLAGS :=3D -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LI= BELF_FLAGS) LDFLAGS +=3D $(LIBELF_LIBS) $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS) @@ -38,6 +45,7 @@ elfshdr :=3D $(shell echo '$(pound)include ' | = $(CC) $(CFLAGS) -x c -E - CFLAGS +=3D $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED) =20 AWK =3D awk +MKDIR =3D mkdir =20 BUILD_ORC :=3D n =20 @@ -57,13 +65,22 @@ $(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN) $(QUIET_LINK)$(CC) $(OBJTOOL_IN) $(LDFLAGS) -o $@ =20 =20 -$(LIBSUBCMD): fixdep FORCE - $(Q)$(MAKE) -C $(SUBCMD_SRCDIR) OUTPUT=3D$(LIBSUBCMD_OUTPUT) +$(LIBSUBCMD_OUTPUT): + @$(MKDIR) -p $@ + +$(LIBSUBCMD): fixdep FORCE $(LIBSUBCMD_OUTPUT) + @$(MAKE) -C $(LIBSUBCMD_DIR) O=3D$(LIBSUBCMD_OUTPUT) \ + DESTDIR=3D$(LIBSUBCMD_DESTDIR) prefix=3D subdir=3D \ + $@ install_headers + +$(LIBSUBCMD)-clean: + $(call QUIET_CLEAN, libsubcmd) + $(Q)$(RM) -r -- $(LIBSUBCMD_OUTPUT) =20 -clean: +clean: $(LIBSUBCMD)-clean $(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL) $(Q)find $(OUTPUT) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -nam= e '\.*.d' -delete - $(Q)$(RM) $(OUTPUT)arch/x86/lib/inat-tables.c $(OUTPUT)fixdep $(LIBSUBCMD) + $(Q)$(RM) $(OUTPUT)arch/x86/lib/inat-tables.c $(OUTPUT)fixdep =20 FORCE: =20 --=20 2.38.1.584.g0f3c55d4c2-goog From nobody Wed Apr 15 21:32:52 2026 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 4C4B1C4332F for ; Tue, 22 Nov 2022 00:12:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232203AbiKVAM1 (ORCPT ); Mon, 21 Nov 2022 19:12:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232109AbiKVAMH (ORCPT ); Mon, 21 Nov 2022 19:12:07 -0500 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B64B0C4949 for ; Mon, 21 Nov 2022 16:12:04 -0800 (PST) Received: by mail-pj1-x104a.google.com with SMTP id s18-20020a17090aad9200b00218a1ef5c00so2440860pjq.3 for ; Mon, 21 Nov 2022 16:12:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=dAoGw6w4KlL7DQVt7ZsS6OCEJRbgq50upBPjFJ4o4ig=; b=BrggVwj0H1omWRQ69YMIUK21XBMjpa7HVYTK62MFY+Cb1CVXGLi4683S8vfkF0PlDM iakDSbG0hQ1GrjLKiYu+30WQWoGLlKWLb0p65JCmlI1aDPoMI0jiuCnzgxOflZSLS4Mo +D88Umt4pSij+Ntjtuvcwcw5DTxcYIBsaZnO5JLYqwEig0u1hFvA6h1s2vePSQZbhaMn 2tPAC9dLJguoQRb9z1bn/v20WbWjqhZzy1ZSqHvEYvPvmcxzrjqilM83hKRKhTVKkAYk eAqcLKxHBZKEubi4UsMMBTlys38TZYdzQ1RoNwRZ7qYQqamyn6pG9gfN725/Qq4ewSwD AL5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=dAoGw6w4KlL7DQVt7ZsS6OCEJRbgq50upBPjFJ4o4ig=; b=kwosJrpF+AZuSCF4fernJ0GvEe3qrN8AGepqzdxW6MjzYB5pHOzaoilhcE5VAGfTSa bts87OKxyuOIw9oqmpb4593slH/hRb4EKz4TtfB5WfApp6UctKAuS6dBuJvhvp2ROWU4 YGI9Wy1x7Ss2zPg+4p0NOd4Luqzqb3Lgl++jK0sUUq+FIAO6FPEpzxjW7xv/5N7VFnMZ UC1pRrGU8P1z0WX/nUdUQm2js37pDKo7Rgxt6G1q2Rqu4O5qogaDI7I/rgwdwD4jSshl iiBNeabiKRXhCihTgx3V6j7LEwvfchVkKeDqCK19Ho0zZj5N9ZfRnUydTb/05qUYi/xu IZpg== X-Gm-Message-State: ANoB5pljrbJmbkLLL3Vi/MiEs4VGtvJSlPdcCUxKsi6f/YKZkbKtlPQb VvSVCVaeQUsBcpYew7oERu1biF9VbiCc X-Google-Smtp-Source: AA0mqf5Kgc3bsP9gBxnvcDjksJSsFLESy8wL+H9dz7KepClvv259CCM7hhm9K/74CsCQx0djpkoaoVYlMXAm X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:2107:a1f5:8582:5608]) (user=irogers job=sendgmr) by 2002:a63:f4b:0:b0:46f:98cf:3bb6 with SMTP id 11-20020a630f4b000000b0046f98cf3bb6mr1125125pgp.332.1669075924133; Mon, 21 Nov 2022 16:12:04 -0800 (PST) Date: Mon, 21 Nov 2022 16:11:24 -0800 In-Reply-To: <20221122001125.765003-1-irogers@google.com> Message-Id: <20221122001125.765003-4-irogers@google.com> Mime-Version: 1.0 References: <20221122001125.765003-1-irogers@google.com> X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog Subject: [PATCH v2 3/4] objtool: Properly support make V=1 From: Ian Rogers To: Josh Poimboeuf , Peter Zijlstra , Nathan Chancellor , Nick Desaulniers , Tom Rix , Masahiro Yamada , Nicolas Schier , linux-kernel@vger.kernel.org, llvm@lists.linux.dev Cc: Stephane Eranian , Andrii Nakryiko , Jiri Olsa , Arnaldo Carvalho de Melo , Namhyung Kim , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The Q variable was being used but never correctly set up. Add the setting up and use in place of @. Signed-off-by: Ian Rogers Reviewed-by: Nick Desaulniers Tested-by: Nick Desaulniers --- tools/objtool/Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile index fd9b3e3113c6..61a00b7acae9 100644 --- a/tools/objtool/Makefile +++ b/tools/objtool/Makefile @@ -47,6 +47,12 @@ CFLAGS +=3D $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED) AWK =3D awk MKDIR =3D mkdir =20 +ifeq ($(V),1) + Q =3D +else + Q =3D @ +endif + BUILD_ORC :=3D n =20 ifeq ($(SRCARCH),x86) @@ -58,18 +64,18 @@ export srctree OUTPUT CFLAGS SRCARCH AWK include $(srctree)/tools/build/Makefile.include =20 $(OBJTOOL_IN): fixdep FORCE - @$(CONFIG_SHELL) ./sync-check.sh - @$(MAKE) $(build)=3Dobjtool + $(Q)$(CONFIG_SHELL) ./sync-check.sh + $(Q)$(MAKE) $(build)=3Dobjtool =20 $(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN) $(QUIET_LINK)$(CC) $(OBJTOOL_IN) $(LDFLAGS) -o $@ =20 =20 $(LIBSUBCMD_OUTPUT): - @$(MKDIR) -p $@ + $(Q)$(MKDIR) -p $@ =20 $(LIBSUBCMD): fixdep FORCE $(LIBSUBCMD_OUTPUT) - @$(MAKE) -C $(LIBSUBCMD_DIR) O=3D$(LIBSUBCMD_OUTPUT) \ + $(Q)$(MAKE) -C $(LIBSUBCMD_DIR) O=3D$(LIBSUBCMD_OUTPUT) \ DESTDIR=3D$(LIBSUBCMD_DESTDIR) prefix=3D subdir=3D \ $@ install_headers =20 --=20 2.38.1.584.g0f3c55d4c2-goog From nobody Wed Apr 15 21:32:52 2026 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 E7441C4332F for ; Tue, 22 Nov 2022 00:13:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231546AbiKVAM5 (ORCPT ); Mon, 21 Nov 2022 19:12:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232163AbiKVAMP (ORCPT ); Mon, 21 Nov 2022 19:12:15 -0500 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89CD4B7EBA for ; Mon, 21 Nov 2022 16:12:12 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-352e29ff8c2so128265417b3.21 for ; Mon, 21 Nov 2022 16:12:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=f2OEVX8RYPyAcopuDfdaWLt0cg7xaISJPygwT0E0ouc=; b=c4MiccdF0m/dJ6gtmkt+leDsOcrSbyKkmprTSa4NTl6g3KAnmRAuF+gGso2easyZsV FnnkY2OmhIJN4f2BPS0ybe5jTSitq97A6wqCQKnrQFSfSYi2zSLGqRV1VY9kDsvqoP2R t7vrJ0f66IXcQXWLOe03yZNMU4fE8eO1zdHeOlGgNEGBe+TNLpWksnss3EZ6dw5crZh1 gZplgnn9sPsj3eomSopOQzM21GLPpdCGWhE8wt8wWd30fGqgGk1Ez78i9ETM/bve4hbZ NYmLcH2qQd6Co5l6aHL5H7Qkns5w5OP9pjxxeoqiSG1Qbl0VgAM0kCgmBYat/D1EGHzn 5h0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=f2OEVX8RYPyAcopuDfdaWLt0cg7xaISJPygwT0E0ouc=; b=rVGn/FUB86yaye5dFFNC3UtWeWgWJRqkwZziSZ/uImmEZKHLLBZog2olLqeh3n3oxH YHGuYVsuXAwiCpMkht0KZ3NnyVIO+bhIb9xH8ZiYw+d0CjiD8UKmSGgLb9IcpQN8oTqF /hRtekxdnTLqJasRzHZII3ruB1iIFfynV3Vk/l/4Qcptb9Au/1pbdcTp6rW3uDeK9wnw PuZBcrFVlTzKnXVdosWSz0/eEHNflQjA+6jW8Iqghu2YBLtObOUrMV8X1qeVU0HrnET3 qDjDqk258HmhAtQU/0zzCrZF7YZX5jXSGO4I+IwEXHgZjP19EFhyuoiIG/Pr8NJ6HGKR +v4w== X-Gm-Message-State: ANoB5pnvj/b2AQkFFg9vHnxg/b11tXT//9zOO7FNT3b94TP1EKOeuUQ6 MVPSJi0a2UwbzrB2V6VV8LVEhYkEOy7R X-Google-Smtp-Source: AA0mqf6ifB1D27FOoWwlyBAZ6UUO1Cn1HmiU7JlNMhn9b8OXE1+2jtqZr/Gg9ZLVkC4H4FmMym0nmtMkpMBk X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:2107:a1f5:8582:5608]) (user=irogers job=sendgmr) by 2002:a81:25d8:0:b0:373:4467:e0c6 with SMTP id l207-20020a8125d8000000b003734467e0c6mr1500249ywl.340.1669075931876; Mon, 21 Nov 2022 16:12:11 -0800 (PST) Date: Mon, 21 Nov 2022 16:11:25 -0800 In-Reply-To: <20221122001125.765003-1-irogers@google.com> Message-Id: <20221122001125.765003-5-irogers@google.com> Mime-Version: 1.0 References: <20221122001125.765003-1-irogers@google.com> X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog Subject: [PATCH v2 4/4] objtool: Alter how HOSTCC is forced From: Ian Rogers To: Josh Poimboeuf , Peter Zijlstra , Nathan Chancellor , Nick Desaulniers , Tom Rix , Masahiro Yamada , Nicolas Schier , linux-kernel@vger.kernel.org, llvm@lists.linux.dev Cc: Stephane Eranian , Andrii Nakryiko , Jiri Olsa , Arnaldo Carvalho de Melo , Namhyung Kim , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" HOSTCC is always wanted when building objtool. Setting CC to HOSTCC happens after tools/scripts/Makefile.include is included, meaning flags are set assuming say CC is gcc, but then it can be later set to HOSTCC which may be clang. tools/scripts/Makefile.include is needed for host set up and common macros in objtool's Makefile. Rather than override CC to HOSTCC, just pass CC as HOSTCC to Makefile.build, the libsubcmd builds and the linkage step. This means the Makefiles don't see things like CC changing and tool flag determination, and similar, work properly. To avoid mixing CFLAGS from different compilers just the objtool CFLAGS are determined. HOSTCFLAGS is added to these so that command line flags can add to the CFLAGS. Signed-off-by: Ian Rogers Reviewed-by: Nick Desaulniers Tested-by: Nick Desaulniers --- tools/objtool/Makefile | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile index 61a00b7acae9..e550a98e2dd9 100644 --- a/tools/objtool/Makefile +++ b/tools/objtool/Makefile @@ -2,16 +2,12 @@ include ../scripts/Makefile.include include ../scripts/Makefile.arch =20 -# always use the host compiler -AR =3D $(HOSTAR) -CC =3D $(HOSTCC) -LD =3D $(HOSTLD) - ifeq ($(srctree),) srctree :=3D $(patsubst %/,%,$(dir $(CURDIR))) srctree :=3D $(patsubst %/,%,$(dir $(srctree))) endif =20 +MAKE =3D make -S LIBSUBCMD_DIR =3D $(srctree)/tools/lib/subcmd/ ifneq ($(OUTPUT),) LIBSUBCMD_OUTPUT =3D $(abspath $(OUTPUT))/libsubcmd @@ -36,13 +32,20 @@ INCLUDES :=3D -I$(srctree)/tools/include \ -I$(srctree)/tools/objtool/include \ -I$(srctree)/tools/objtool/arch/$(SRCARCH)/include \ -I$(LIBSUBCMD_OUTPUT)/include -WARNINGS :=3D $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-= packed -Wno-nested-externs -CFLAGS :=3D -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LI= BELF_FLAGS) -LDFLAGS +=3D $(LIBELF_LIBS) $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS) +WARNINGS :=3D -Wno-switch-default -Wno-switch-enum -Wno-packed -Wno-nested= -externs +OBJTOOL_CFLAGS :=3D -Werror $(WARNINGS) -g $(INCLUDES) $(LIBELF_FLAGS) $(H= OSTCFLAGS) +OBJTOOL_LDFLAGS :=3D $(LIBELF_LIBS) $(LIBSUBCMD) =20 # Allow old libelf to be used: elfshdr :=3D $(shell echo '$(pound)include ' | $(CC) $(CFLAGS) -= x c -E - | grep elf_getshdr) -CFLAGS +=3D $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED) +OBJTOOL_CFLAGS +=3D $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED) + +# Always want host compilation. +HOST_OVERRIDES :=3D CC=3D"$(HOSTCC)" EXTRA_CFLAGS=3D"$(OBJTOOL_CFLAGS)" \ + LD=3D"$(HOSTLD)" AR=3D"$(HOSTAR)" +BUILD_HOST_OVERRIDES :=3D CC=3D"$(HOSTCC)" CFLAGS=3D"$(OBJTOOL_CFLAGS)" \ + LD=3D"$(HOSTLD)" LDFLAGS=3D"$(OBJTOOL_LDFLAGS)" \ + AR=3D"$(HOSTAR)" =20 AWK =3D awk MKDIR =3D mkdir @@ -65,10 +68,11 @@ include $(srctree)/tools/build/Makefile.include =20 $(OBJTOOL_IN): fixdep FORCE $(Q)$(CONFIG_SHELL) ./sync-check.sh - $(Q)$(MAKE) $(build)=3Dobjtool + $(Q)$(MAKE) $(build)=3Dobjtool $(BUILD_HOST_OVERRIDES) + =20 $(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN) - $(QUIET_LINK)$(CC) $(OBJTOOL_IN) $(LDFLAGS) -o $@ + $(QUIET_LINK)$(HOSTCC) $(OBJTOOL_IN) $(KBUILD_HOSTLDFLAGS) $(OBJTOOL_LDFL= AGS) -o $@ =20 =20 $(LIBSUBCMD_OUTPUT): @@ -77,6 +81,7 @@ $(LIBSUBCMD_OUTPUT): $(LIBSUBCMD): fixdep FORCE $(LIBSUBCMD_OUTPUT) $(Q)$(MAKE) -C $(LIBSUBCMD_DIR) O=3D$(LIBSUBCMD_OUTPUT) \ DESTDIR=3D$(LIBSUBCMD_DESTDIR) prefix=3D subdir=3D \ + $(HOST_OVERRIDES) \ $@ install_headers =20 $(LIBSUBCMD)-clean: --=20 2.38.1.584.g0f3c55d4c2-goog