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 X-Spam-Level: X-Spam-Status: No, score=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10B9FC433ED for ; Tue, 11 May 2021 15:02:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DAD506128E for ; Tue, 11 May 2021 15:02:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231951AbhEKPDq (ORCPT ); Tue, 11 May 2021 11:03:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:36088 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231844AbhEKPDo (ORCPT ); Tue, 11 May 2021 11:03:44 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B030B61364; Tue, 11 May 2021 15:02:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620745358; bh=CuUERNm4Sl05/8TuXuLfVEgbKBAOLkUTkAapTI3XcOA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CuMJAmKg4N6ziSNl0Bat55g1n8CBKqV5u83Gieo81F3ScyXEJmGWICplH2GDy1la6 +9IgXZHW9UI0Yg0g8OKI1DpcueQtUwAFRV7YZ0zqPuD9tyM1Idz1eBJnkvhYcAwdp5 8rlG+ZkOY5cPAJaHv/GHkNyF2mopui9JKL3sV3YFjTKA1p+PtP2wtb1yeR6dffh6Uv ++Si6qjzLC6YqjAQtnJMsYmUoMg5oRxRaFomXX5teSowC6pCpzSpZZDauA2KaxsZsf +ooOy+5Yr0N9lOaRAyzQ8p6RVz+67aJYPFyoahXjsUVn5SRJrh3bkMM2v4HVY7d1I0 oS/Y+nICD27aw== From: Masami Hiramatsu To: Arnaldo Carvalho de Melo Cc: Anders Roxell , Leo Yan , linux-kernel@vger.kernel.org, Nathan Chancellor , Nick Desaulniers Subject: [PATCH 1/2] perf build: Move EXTRA_CFLAGS and EXTRA_WARNINGS at the end of CFLAGS Date: Wed, 12 May 2021 00:02:34 +0900 Message-Id: <162074535428.289757.16452586688199107510.stgit@devnote2> X-Mailer: git-send-email 2.25.1 In-Reply-To: <162074534493.289757.1243545574686276554.stgit@devnote2> References: <162074534493.289757.1243545574686276554.stgit@devnote2> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move EXTRA_CFLAGS and EXTRA_WARNINGS at the end of CFLAGS so that additional flags will be passed to the compiler correctly. CFLAGS is composed by CORE_CFLAGS, INC_FLAGS, EXTRA_CFLAGS, and EXTRA_WARNINGS in the following order; CFLAGS = $EXTRA_CFLAGS $EXTRA_WARNINGS $CORE_CFLAGS $INC_FLAGS But since CORE_CFLAGS includes "-Wall" and "-Wextra", the other -Wno-* flags in EXTRA_CFLAGS and EXTRA_WARNINGS are overridden and ignored. To fix this issue, move those EXTRA_* at the end of CFLAGS definition as below. CFLAGS = $CORE_CFLAGS $INC_FLAGS $EXTRA_CFLAGS $EXTRA_WARNINGS Signed-off-by: Masami Hiramatsu --- tools/perf/Makefile.config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 406a9519145e..2ad46c66bc7b 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -16,7 +16,7 @@ $(shell printf "" > $(OUTPUT).config-detected) detected = $(shell echo "$(1)=y" >> $(OUTPUT).config-detected) detected_var = $(shell echo "$(1)=$($(1))" >> $(OUTPUT).config-detected) -CFLAGS := $(EXTRA_CFLAGS) $(filter-out -Wnested-externs,$(EXTRA_WARNINGS)) +CFLAGS := include $(srctree)/tools/scripts/Makefile.arch @@ -340,6 +340,7 @@ INC_FLAGS += -I$(srctree)/tools/lib/ CORE_CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE CFLAGS += $(CORE_CFLAGS) $(INC_FLAGS) +CFLAGS += $(EXTRA_CFLAGS) $(filter-out -Wnested-externs,$(EXTRA_WARNINGS)) CXXFLAGS += $(INC_FLAGS) LIBPERF_CFLAGS := $(CORE_CFLAGS) $(EXTRA_CFLAGS)