From b71a678232eca441b374221d2544404e41fbe572 Mon Sep 17 00:00:00 2001
From: Tom de Vries <tom@codesourcery.com>
Date: Tue, 8 Sep 2015 21:20:51 +0000
Subject: [PATCH] Prevent unnecessary recompilation for trivial params.def
 changes

2015-09-08  Tom de Vries  <tom@codesourcery.com>

	* Makefile.in (generated_files): Add params.list.
	(params.list, s-params.list): Add rule.
	* params.h (enum compiler_param): Include params-list.h.  Move define
	DEFPARAM, include params.def and undef DEFPARAM ...
	* params-list.h: ... here.  New file.

From-SVN: r227566
---
 gcc/ChangeLog     | 8 ++++++++
 gcc/Makefile.in   | 8 +++++++-
 gcc/params-list.h | 4 ++++
 gcc/params.h      | 5 +----
 4 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 gcc/params-list.h

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fb7d644eac9..d8dd36a6de1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2015-09-08  Tom de Vries  <tom@codesourcery.com>
+
+	* Makefile.in (generated_files): Add params.list.
+	(params.list, s-params.list): Add rule.
+	* params.h (enum compiler_param): Include params-list.h.  Move define
+	DEFPARAM, include params.def and undef DEFPARAM ...
+	* params-list.h: ... here.  New file.
+
 2015-09-08  David Malcolm  <dmalcolm@redhat.com>
 
 	* pretty-print.h (printer_fn): Fix typo in comment.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 3d1c1e5aba3..b495bd2eb3f 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2415,7 +2415,7 @@ generated_files = config.h tm.h $(TM_P_H) $(TM_H) multilib.h \
        $(ALL_GTFILES_H) gtype-desc.c gtype-desc.h gcov-iov.h \
        options.h target-hooks-def.h insn-opinit.h \
        common/common-target-hooks-def.h pass-instances.def \
-       c-family/c-target-hooks-def.h
+       c-family/c-target-hooks-def.h params.list
 
 #
 # How to compile object files to run on the build machine.
@@ -3236,6 +3236,12 @@ installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(man1dir)
 	$(mkinstalldirs) $(DESTDIR)$(man7dir)
 
+params.list: s-params.list; @true
+s-params.list: $(srcdir)/params-list.h $(srcdir)/params.def
+	$(CPP) $(srcdir)/params-list.h | sed 's/^#.*//;/^$$/d' > tmp-params.list
+	$(SHELL) $(srcdir)/../move-if-change tmp-params.list params.list
+	$(STAMP) s-params.list
+
 PLUGIN_HEADERS = $(TREE_H) $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
   toplev.h $(DIAGNOSTIC_CORE_H) $(BASIC_BLOCK_H) $(HASH_TABLE_H) \
   tree-ssa-alias.h $(INTERNAL_FN_H) gimple-fold.h tree-eh.h gimple-expr.h \
diff --git a/gcc/params-list.h b/gcc/params-list.h
new file mode 100644
index 00000000000..49301d2e96d
--- /dev/null
+++ b/gcc/params-list.h
@@ -0,0 +1,4 @@
+#define DEFPARAM(enumerator, option, nocmsgid, default, min, max) \
+  enumerator,
+#include "params.def"
+#undef DEFPARAM
diff --git a/gcc/params.h b/gcc/params.h
index f53426dfea6..9f7618ac1d1 100644
--- a/gcc/params.h
+++ b/gcc/params.h
@@ -81,10 +81,7 @@ extern void set_param_value (const char *name, int value,
 
 enum compiler_param
 {
-#define DEFPARAM(enumerator, option, nocmsgid, default, min, max) \
-  enumerator,
-#include "params.def"
-#undef DEFPARAM
+#include "params.list"
   LAST_PARAM
 };
 
-- 
2.30.2