From: "H.J. Lu" <hjl.tools@gmail.com>
To: Binutils <binutils@sourceware.org>,
Matthias Klose <doko@ubuntu.com>,
GCC Patches <gcc-patches@gcc.gnu.org>,
GDB <gdb-patches@sourceware.org>
Subject: [PATCH] Add missing changes to Makefile.tpl
Date: Sun, 28 Feb 2021 04:44:45 -0800 [thread overview]
Message-ID: <CAMe9rOp8Og1Zhb0tO8-f1zVcSB=72F5aVN050J4AC0a6ZbrE7g@mail.gmail.com> (raw)
In-Reply-To: <YDs/sGJP74qVJteb@vapier>
[-- Attachment #1: Type: text/plain, Size: 689 bytes --]
On Sat, Feb 27, 2021 at 11:01 PM Mike Frysinger <vapier@gentoo.org> 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.
--
H.J.
[-- Attachment #2: 0001-Add-missing-changes-to-Makefile.tpl.patch --]
[-- Type: text/x-patch, Size: 2163 bytes --]
From 1dbde357be3ce2641595b10436822e699abe32a0 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
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 <hjl.tools@gmail.com>
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 <hongjiu.lu@intel.com>
+
+ 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 <amodra@gmail.com>
* 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
next prev parent reply other threads:[~2021-02-28 12:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-19 18:10 V3 [PATCH 0/5] Support the PGO build for binutils+gdb H.J. Lu
2020-12-19 18:10 ` V3 [PATCH 1/5] GCC: Pass --plugin to AR and RANLIB H.J. Lu
2020-12-19 18:10 ` V3 [PATCH 2/5] Binutils: " H.J. Lu
2020-12-19 18:10 ` V3 [PATCH 3/5] Support the PGO build for binutils+gdb H.J. Lu
2021-02-28 7:01 ` Mike Frysinger
2021-02-28 12:44 ` H.J. Lu [this message]
2020-12-19 18:10 ` V3 [PATCH 4/5] Set TESTS to gdb.dwarf2/*.exp for PGO build training H.J. Lu
2020-12-19 18:10 ` V3 [PATCH 5/5] gnulib: Support variables from the top level Makefile H.J. Lu
2020-12-31 23:50 ` Joseph Myers
2021-01-01 0:06 ` H.J. Lu
2021-01-05 13:26 ` Christian Biesinger
2021-01-05 14:06 ` H.J. Lu
2021-01-02 19:22 ` V3 [PATCH 0/5] Support the PGO build for binutils+gdb Segher Boessenkool
2021-01-02 19:46 ` H.J. Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAMe9rOp8Og1Zhb0tO8-f1zVcSB=72F5aVN050J4AC0a6ZbrE7g@mail.gmail.com' \
--to=hjl.tools@gmail.com \
--cc=binutils@sourceware.org \
--cc=doko@ubuntu.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).