From patchwork Thu Jan 5 09:01:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 39395 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp201207wrt; Thu, 5 Jan 2023 01:06:08 -0800 (PST) X-Google-Smtp-Source: AMrXdXuchiHtBoUOrnkKMsKkS41i2XdIp0ciMrBlPkL7gxMDaJQv4ZEedl7+mby24tCccqTpYe3H X-Received: by 2002:a05:6402:1948:b0:470:1f1:257a with SMTP id f8-20020a056402194800b0047001f1257amr45012339edz.25.1672909568438; Thu, 05 Jan 2023 01:06:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672909568; cv=none; d=google.com; s=arc-20160816; b=moLDb8dwwtbemFNccjODdwcSRGS4RBG3NBO+c4NRQYcrnORBmcJF9t7PXTvZVQY/an epKjmm2INk75nKr9mRE1p/GlFpKHOji6LmrviCr0sBmDbp2QwDXikFypNkNJlWdRLLOB otXQqG3WUTw4YAZppsKWak7C9/5yBav3OOJ7R+02EpLYWhgVFp6ZHANriR6ecPgXZyj9 CxxTvNuksIckjsHB0Orj1oVMor59nMUYDjO3bsRX4IyGv1McIr5zGGNK96cbaY3bXaJS dWWS+UirSf8ZCAArtVrkfFqP7On7s+HXB6QEYh0CLqC/3zOBz3Rsi6IP7WWS20VgZVxP 6KqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=v3C6oUUNqAe6SouB7tmV8ak/X52sdVelkHDk9iVtEts=; b=U+QhdRRiKUIUXY5BFq1sosNKBrbhr63S5e5DqH25Jsa5OAcDpvrP3sdQpbYwbWGlDs Xg9+4tELx5ozQ79TjqWza2v5MFQJmkm1cn+kXlK+85iRbGMldkJ5hntHTPK/2EWrtook 4hWLdVr2Kf6EZe7gKwzU6xKp5nTuLny0fhHDkJD3nZIB9MzpJUM02irwl7JrThb0KLsD w3NKjFmV6se6nIURxEo3Mv9KOWquEqZvaZobCy0VKXwuB/o2ES/UPi7tOHA7DmOhM19m olr4DQNQmpEYF4rqTRWH/4BouhwQLv3xzUB5lTH9m3Z6AKg79wNtunJcuAX19lB1ZUU2 JgLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=WPFw1OLN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m7-20020a170906848700b007c0ef00a05csi26618948ejx.922.2023.01.05.01.05.44; Thu, 05 Jan 2023 01:06:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=WPFw1OLN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231836AbjAEJDB (ORCPT + 99 others); Thu, 5 Jan 2023 04:03:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231866AbjAEJC2 (ORCPT ); Thu, 5 Jan 2023 04:02:28 -0500 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB8A150077 for ; Thu, 5 Jan 2023 01:02:23 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-4755eb8a57bso285854147b3.12 for ; Thu, 05 Jan 2023 01:02:23 -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=v3C6oUUNqAe6SouB7tmV8ak/X52sdVelkHDk9iVtEts=; b=WPFw1OLNMuFxaskhsLx3FPzw7/x0/K4eifGQNNWYSlsuL1S+86v33juk06zYg+uPoE G1GVeLQbT0/duDibET5al+ECKeQ/qi6++s2naUGTlzTYW4fUZLBCq7/Lbrj4mxLMPkr2 cSl9uxxC9lnB7Vd18Wy98iI828Y3CeQTbpqa7JIgkjjRPv6sCn1Q59jnbsDYhC0wjXPh kHaZ2YxCpQt2q5rBpv8mSEQtDFoD08ulvxKb8NWz3gzWgw1hOJKkYHpi2604Yip70ewj DWE3sFX19lDfNmlqw0+n+c8UZzqKAXu+glEoKxTw5dxFTx27Hmrx8b4SFPVLpgO4jK9z M1Hg== 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=v3C6oUUNqAe6SouB7tmV8ak/X52sdVelkHDk9iVtEts=; b=xb4+F6JP/BDn6jpSdEZ4Uhly2wlOXBJP1a4pHAuhZoZyFyIiRfedC7EWt5yfIUmHfz E80UgAdhKNr6nQd8h0SVWpyg5Gt6ISC0vGATeyx/YWlzNQF2yyJ4IQ2fYulT5UW17jV9 uNQ1X2EVhhvzOLM+GGWndnCK5Y/7MecZZ2IK2UcxyMDt3z5IIwXb6CCBxOFXqNtwOPgD ftNuc1+KP52I7B0VrQumwGaWnCFmMOwc3/ec+TzhpIF7aeW9nfGIsYCTy8mcsSvWgeyz CA8LYUtYWr3Za6afFl3QZo7H+hQs7PisFyVMBtOfbmPNOcq+mCuK/+DQ+D/XiuT32v0R rTaA== X-Gm-Message-State: AFqh2kqtMxZB/or0/5bWK+DHB4i45/seu7DRnYpLyZfKwaYv2R9ESIeP /6+ls5G+d2csCePGt9rYs3+KRADmZAgP X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:8775:c864:37e:2f9b]) (user=irogers job=sendgmr) by 2002:a25:c03:0:b0:716:deb3:141b with SMTP id 3-20020a250c03000000b00716deb3141bmr5110692ybm.508.1672909343036; Thu, 05 Jan 2023 01:02:23 -0800 (PST) Date: Thu, 5 Jan 2023 01:01:54 -0800 In-Reply-To: <20230105090155.357604-1-irogers@google.com> Message-Id: <20230105090155.357604-3-irogers@google.com> Mime-Version: 1.0 References: <20230105090155.357604-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Subject: [PATCH v3 2/3] 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 X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754172823333720177?= X-GMAIL-MSGID: =?utf-8?q?1754172823333720177?= 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 Reviewed-by: Nicolas Schier --- 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 += $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED) AWK = awk MKDIR = mkdir +ifeq ($(V),1) + Q = +else + Q = @ +endif + BUILD_ORC := n ifeq ($(SRCARCH),x86) @@ -58,18 +64,18 @@ export srctree OUTPUT CFLAGS SRCARCH AWK include $(srctree)/tools/build/Makefile.include $(OBJTOOL_IN): fixdep FORCE - @$(CONFIG_SHELL) ./sync-check.sh - @$(MAKE) $(build)=objtool + $(Q)$(CONFIG_SHELL) ./sync-check.sh + $(Q)$(MAKE) $(build)=objtool $(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN) $(QUIET_LINK)$(CC) $(OBJTOOL_IN) $(LDFLAGS) -o $@ $(LIBSUBCMD_OUTPUT): - @$(MKDIR) -p $@ + $(Q)$(MKDIR) -p $@ $(LIBSUBCMD): fixdep FORCE $(LIBSUBCMD_OUTPUT) - @$(MAKE) -C $(LIBSUBCMD_DIR) O=$(LIBSUBCMD_OUTPUT) \ + $(Q)$(MAKE) -C $(LIBSUBCMD_DIR) O=$(LIBSUBCMD_OUTPUT) \ DESTDIR=$(LIBSUBCMD_DESTDIR) prefix= subdir= \ $@ install_headers