aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaius Mulley <gaius.mulley@southwales.ac.uk>2022-05-16 12:20:15 +0100
committerGaius Mulley <gaius.mulley@southwales.ac.uk>2022-05-16 12:20:15 +0100
commit67ce904a2e98c1ad34298340193cbd8c3fedb40f (patch)
tree6e16c14f13e220d17b06020b1363486ddec9a6b5
parentf5a02fa669b790ab06868bbf6514d566464e69bb (diff)
downloadgcc-67ce904a2e98c1ad34298340193cbd8c3fedb40f.zip
gcc-67ce904a2e98c1ad34298340193cbd8c3fedb40f.tar.gz
gcc-67ce904a2e98c1ad34298340193cbd8c3fedb40f.tar.bz2
m2rte.cc reduce include headers and correct build dependencies.
2022-05-16 Gaius Mulley <gaius.mulley@southwales.ac.uk> 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 <gaius.mulley@southwales.ac.uk>
-rw-r--r--gcc/m2/Make-lang.in4
-rw-r--r--gcc/m2/plugin/m2rte.cc25
2 files changed, 8 insertions, 21 deletions
diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in
index dec6033..1e931e3 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 f3c92d4..2f4162b 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"