From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1499) id 438D13857346; Mon, 16 May 2022 11:29:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 438D13857346 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Gaius Mulley To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/modula-2] m2rte.cc reduce include headers and correct build dependencies. X-Act-Checkin: gcc X-Git-Author: Gaius Mulley X-Git-Refname: refs/heads/devel/modula-2 X-Git-Oldrev: f5a02fa669b790ab06868bbf6514d566464e69bb X-Git-Newrev: 67ce904a2e98c1ad34298340193cbd8c3fedb40f Message-Id: <20220516112921.438D13857346@sourceware.org> Date: Mon, 16 May 2022 11:29:21 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 May 2022 11:29:21 -0000 https://gcc.gnu.org/g:67ce904a2e98c1ad34298340193cbd8c3fedb40f commit 67ce904a2e98c1ad34298340193cbd8c3fedb40f Author: Gaius Mulley Date: Mon May 16 12:20:15 2022 +0100 m2rte.cc reduce include headers and correct build dependencies. 2022-05-16 Gaius Mulley This patch corrects the dependencies to build m2rte.so in Make-lang.in. It also reduces the number of headers used in m2rte.cc. gcc/m2/ChangeLog: * plugin/m2rte.cc (alias.h, predict.h, tm.h, stringpool.h, toplev.h, basic-block.h, hash-table.h, vec.h, ggc.h, basic-block.h, tree-ssa-alias.h, internal-fn.h, gimple-fold.h, tree-eh.h, gimple-expr.h, is-a.h): Header file includes removed. (plugin/m2rte$(exeext).so) Make dependent upon $(GCC_HEADER_DEPENDENCIES_FOR_M2) and insn-addr-common.h. Signed-off-by: Gaius Mulley Diff: --- gcc/m2/Make-lang.in | 4 ++-- gcc/m2/plugin/m2rte.cc | 25 ++++++------------------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in index dec6033b39e..1e931e3790d 100644 --- a/gcc/m2/Make-lang.in +++ b/gcc/m2/Make-lang.in @@ -391,8 +391,8 @@ m2.install-plugin: installdirs $(INSTALL_PROGRAM) plugin/m2rte$(exeext).so $(DESTDIR)$(plugin_resourcesdir)/m2rte$(exeext).so chmod a+x $(DESTDIR)$(plugin_resourcesdir)/m2rte$(exeext).so -plugin/m2rte$(exeext).so: $(srcdir)/m2/plugin/m2rte.cc $(TARGET_H) $(PLUGIN_HEADERS) \ - $(srcdir)/flags.h gtype-m2.h m2/gm2config.h +plugin/m2rte$(exeext).so: $(srcdir)/m2/plugin/m2rte.cc $(GCC_HEADER_DEPENDENCIES_FOR_M2) \ + insn-attr-common.h $(generated_files) test -d plugin || mkdir plugin $(PLUGINCC) $(PLUGINCFLAGS) -fno-rtti -I. -I$(srcdir) -I$(srcdir)/m2 -I$(srcdir)/m2/gm2-gcc -I$(srcdir)/../include -I$(srcdir)/../libcpp/include -Wall $(GMPINC) -Wno-literal-suffix -fPIC -c -o plugin/m2rte.o $(srcdir)/m2/plugin/m2rte.cc $(PLUGINCC) $(PLUGINCFLAGS) $(PLUGINLIBS) -fno-rtti plugin/m2rte.o -shared -o $@ diff --git a/gcc/m2/plugin/m2rte.cc b/gcc/m2/plugin/m2rte.cc index f3c92d436a8..2f4162b29c2 100644 --- a/gcc/m2/plugin/m2rte.cc +++ b/gcc/m2/plugin/m2rte.cc @@ -24,31 +24,18 @@ along with GNU Modula-2; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" -#include "predict.h" -#include "tm.h" +#include "options.h" +#include "tree-pass.h" +#include "diagnostic-core.h" +#include "flags.h" +#include "intl.h" +#include "plugin.h" #include "tree.h" -#include "stringpool.h" -#include "toplev.h" -#include "basic-block.h" -#include "hash-table.h" -#include "vec.h" -#include "ggc.h" -#include "basic-block.h" -#include "tree-ssa-alias.h" -#include "internal-fn.h" -#include "gimple-fold.h" -#include "tree-eh.h" -#include "gimple-expr.h" -#include "is-a.h" #include "gimple.h" #include "gimplify.h" #include "gimple-iterator.h" #include "gimplify-me.h" #include "gimple-pretty-print.h" -#include "tree.h" -#include "tree-pass.h" -#include "intl.h" #include "plugin-version.h" #include "diagnostic.h" #include "context.h"