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.

diff --git a/ChangeLog b/ChangeLog
index e9a5611c5e71bb498816c36f5630c52a2abd0d08..4cd48fa1dad38f585fc9b285e099104b3b0611dd 100644 (file)
--- 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 38f0b021f43c3948ae7c14fc206216c799debf70..84fee3dd0f796cdd89ca876bb7f3e0f13aa722ac 100644 (file)
--- 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 \