From patchwork Sun Feb 28 12:44:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1445248 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=cZdnlFfZ; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DpNR141wyz9sR4 for ; Sun, 28 Feb 2021 23:45:30 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A64313844060; Sun, 28 Feb 2021 12:45:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A64313844060 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1614516326; bh=b3q8Yhdof38QTn0g6+WeJv9VtJ5r4gggQCf0z44LNL8=; h=References:In-Reply-To:Date:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=cZdnlFfZR9/sii4QTWyHCnQV7onHCjZEa5ebT09PpN2hgRBsq529J/bHvloyeJy15 ZEqpHLunyItNCZa6IjLfpfOGLn070QYGkIj4b9OOBbSrqFShy50dE31zU5P9Svcots /yaMnKxmftcR+Qu0z8BYyedy1ALBewTXh3fIIyfQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-oi1-x234.google.com (mail-oi1-x234.google.com [IPv6:2607:f8b0:4864:20::234]) by sourceware.org (Postfix) with ESMTPS id DBF7E3858D33 for ; Sun, 28 Feb 2021 12:45:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org DBF7E3858D33 Received: by mail-oi1-x234.google.com with SMTP id d20so15165459oiw.10 for ; Sun, 28 Feb 2021 04:45:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=b3q8Yhdof38QTn0g6+WeJv9VtJ5r4gggQCf0z44LNL8=; b=dH57ZMmBbgKgZTbdS7V49hHlH2lb0Na+gQ4uXXXxy60oBfwE7i2vpuLFIcXkPF9OD5 J6YdmSWHRhuVyomLyY9wsp5bioXFZQUlZpu0bhRdwWulSadc4FVN8IrQ7iR/AT1rySHe oTGB37bMi7nXcqPtjodpRgI/wtgE11vDZmqYilAt3AoynBccY+o+RY+oT+i2K9TisInd 6bVUowo6AbRCqcNbhq4kbjpwNrDgq92QzH5Aiahkl2TZ03HRS6hbU3ifysSHNwQNlz86 IPxE/kKt8qNmfDaJkEZGhzZNCyEsHoZ18zzchtMtKFHCnHffMPzU2Gs9iyCTFO3GHLO0 nMww== X-Gm-Message-State: AOAM5317LRK0gXdW2bSRcrlRUsyYU7HJ4pOqbCxelMNVvaE4tsgDVbUj pCHM7kefJhQoRMkNbdQ59YiyvX+t+j26TRXgl+Q= X-Google-Smtp-Source: ABdhPJw7S1e0Yo6sjVQQR4TGsUS/Zrn1rLactkXLHMppedU5L1Zjgx+gUucaYQJ/VX7lLr4/jIxalK6Hn59R4veb08w= X-Received: by 2002:a54:468f:: with SMTP id k15mr8138843oic.58.1614516321351; Sun, 28 Feb 2021 04:45:21 -0800 (PST) MIME-Version: 1.0 References: <20201219181036.178248-1-hjl.tools@gmail.com> <20201219181036.178248-4-hjl.tools@gmail.com> In-Reply-To: Date: Sun, 28 Feb 2021 04:44:45 -0800 Message-ID: Subject: [PATCH] Add missing changes to Makefile.tpl To: Binutils , Matthias Klose , GCC Patches , GDB X-Spam-Status: No, score=-3035.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Gcc-patches" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" On Sat, Feb 27, 2021 at 11:01 PM Mike Frysinger wrote: > > On 19 Dec 2020 10:10, H.J. Lu via Gdb-patches wrote: > > --- a/Makefile.in > > +++ b/Makefile.in > > > > +PGO_BUILD_TRAINING_FLAGS_TO_PASS = \ > > + PGO_BUILD_TRAINING=yes \ > > + CFLAGS_FOR_TARGET="$(PGO_BUILD_TRAINING_CFLAGS)" \ > > + CXXFLAGS_FOR_TARGET="$(PGO_BUILD_TRAINING_CXXFLAGS)" > > + > > +# Ignore "make check" errors in PGO training runs. > > +PGO_BUILD_TRAINING_MFLAGS = -i > > these lines are in Makefile.in but not Makefile.tpl. so regenerating > the file causes them to be removed. can you take a look please ? > I checked in this patch as an obvious change. Thanks. From 1dbde357be3ce2641595b10436822e699abe32a0 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sun, 28 Feb 2021 04:39:38 -0800 Subject: [PATCH] Add missing changes to Makefile.tpl Update Makefile.tpl to add missing changes in commit af019bfde9b13d628202fe58054ec7ff08d92a0f Author: H.J. Lu Date: Sat Jan 9 06:51:15 2021 -0800 Support the PGO build for binutils+gdb "autogen Makefile.def" showed no changes in Makefile.in. PR binutils/26766 * Makefile.tpl (PGO_BUILD_TRAINING_FLAGS_TO_PASS): Add PGO_BUILD_TRAINING=yes. (PGO_BUILD_TRAINING_MFLAGS): New. (all): Pass $(PGO_BUILD_TRAINING_MFLAGS) to the PGO build. --- ChangeLog | 8 ++++++++ Makefile.tpl | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index e9a5611c5e7..4cd48fa1dad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2021-02-28 H.J. Lu + + PR binutils/26766 + * Makefile.tpl (PGO_BUILD_TRAINING_FLAGS_TO_PASS): Add + PGO_BUILD_TRAINING=yes. + (PGO_BUILD_TRAINING_MFLAGS): New. + (all): Pass $(PGO_BUILD_TRAINING_MFLAGS) to the PGO build. + 2021-02-09 Alan Modra * configure.ac: Delete arm*-*-symbianelf* entry. diff --git a/Makefile.tpl b/Makefile.tpl index 38f0b021f43..84fee3dd0f7 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -440,9 +440,13 @@ PGO_BUILD_TRAINING_CFLAGS:= \ PGO_BUILD_TRAINING_CXXFLAGS:= \ $(filter-out -specs=%,$(PGO_BUILD_TRAINING_CXXFLAGS)) PGO_BUILD_TRAINING_FLAGS_TO_PASS = \ + PGO_BUILD_TRAINING=yes \ CFLAGS_FOR_TARGET="$(PGO_BUILD_TRAINING_CFLAGS)" \ CXXFLAGS_FOR_TARGET="$(PGO_BUILD_TRAINING_CXXFLAGS)" +# Ignore "make check" errors in PGO training runs. +PGO_BUILD_TRAINING_MFLAGS = -i + # Additional PGO and LTO compiler options to use profiling data for the # PGO build. PGO_BUILD_USE_FLAGS_TO_PASS = \ @@ -784,6 +788,7 @@ all: $(PGO_BUILD_GEN_FLAGS_TO_PASS) all-host all-target \ @if pgo-build && $(MAKE) $(RECURSE_FLAGS_TO_PASS) \ + $(PGO_BUILD_TRAINING_MFLAGS) \ $(PGO_BUILD_TRAINING_FLAGS_TO_PASS) \ $(PGO_BUILD_TRAINING) \ && $(MAKE) $(RECURSE_FLAGS_TO_PASS) clean \ -- 2.29.2