move all declarations to a same .h file

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230825 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d61154fdb504ba5ead76fad522d0a16837ba4d56..8221d0b8d7bf32e1321bc5dfff38a37ac30fc776 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,18 @@
+2015-11-23  Aditya Kumar  <aditya.k7@samsung.com>
+           Sebastian Pop  <s.pop@samsung.com>
+
+       * graphite-dependences.c: Only include graphite.h.
+       * graphite-isl-ast-to-gimple.c: Same.
+       * graphite-optimize-isl.c: Same.
+       * graphite-poly.c: Same.
+       * graphite-scop-detection.c: Same.
+       * graphite-sese-to-poly.c: Same.
+       * graphite.c: Same.
+       * graphite-isl-ast-to-gimple.h: Move to graphite.h.
+       * graphite-poly.h: Same.
+       * graphite-scop-detection.h: Same.
+       * graphite.h: New.
+
 2015-11-24  Pierre-Marie de Rodat  <derodat@adacore.com>
 
        * dwarf2out.c (gen_decl_die): Generate DW_TAG_imported_* instead of

diff --git a/gcc/graphite-dependences.c b/gcc/graphite-dependences.c
index 3f4e5ea8fe6f37a9507ebb193abc722c073fd4fa..fcc771b9658ebf1477f893db95280e57a2396358 100644 (file)
--- a/gcc/graphite-dependences.c
+++ b/gcc/graphite-dependences.c
@@ -45,7 +45,7 @@ along with GCC; see the file COPYING3.  If not see
 #include <isl/flow.h>
 #include <isl/constraint.h>
 
-#include "graphite-poly.h"
+#include "graphite.h"
 
 
 /* Add the constraints from the set S to the domain of MAP.  */

diff --git a/gcc/graphite-isl-ast-to-gimple.c b/gcc/graphite-isl-ast-to-gimple.c
index 1d986f85905cebfadd46774710dda49c49cdae1b..58cccce70b392aa5abfe17135b3370ffcee4c3c3 100644 (file)
--- a/gcc/graphite-isl-ast-to-gimple.c
+++ b/gcc/graphite-isl-ast-to-gimple.c
@@ -70,8 +70,7 @@ extern "C" {
 }
 #endif
 
-#include "graphite-poly.h"
-#include "graphite-isl-ast-to-gimple.h"
+#include "graphite.h"
 
 #include <map>
 

diff --git a/gcc/graphite-isl-ast-to-gimple.h b/gcc/graphite-isl-ast-to-gimple.h
deleted file mode 100644 (file)
index dc8a934..0000000
--- a/gcc/graphite-isl-ast-to-gimple.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Translation of ISL AST to Gimple.
-   Copyright (C) 2014-2015 Free Software Foundation, Inc.
-   Contributed by Roman Gareev <gareevroman@gmail.com>.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING3.  If not see
-<http://www.gnu.org/licenses/>.  */
-
-#ifndef GCC_GRAPHITE_ISL_AST_TO_GIMPLE_H
-#define GCC_GRAPHITE_ISL_AST_TO_GIMPLE_H
-
-extern bool graphite_regenerate_ast_isl (scop_p);
-
-#endif

diff --git a/gcc/graphite-optimize-isl.c b/gcc/graphite-optimize-isl.c
index 559afc481b2d977e0e86e43a332771379035a827..8727e39e4c6fe68cdc3fc781ac42fd6503558906 100644 (file)
--- a/gcc/graphite-optimize-isl.c
+++ b/gcc/graphite-optimize-isl.c
@@ -52,7 +52,7 @@ along with GCC; see the file COPYING3.  If not see
 #include <isl/schedule_node.h>
 #endif
 
-#include "graphite-poly.h"
+#include "graphite.h"
 
 #ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS
 

diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c
index c783fc31e02cc87bdc00a7628621e0263e6df6f0..a51aefe574c16732beede84d53a5d4331e56a112 100644 (file)
--- a/gcc/graphite-poly.c
+++ b/gcc/graphite-poly.c
@@ -57,7 +57,7 @@ extern "C" {
 }
 #endif
 
-#include "graphite-poly.h"
+#include "graphite.h"
 
 #define OPENSCOP_MAX_STRING 256
 

diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c
index 60bb0499f081dfebb84a2cc61b2555f292b304ad..1f8fc76f3f846d29a4e68883c2af85e0e1303051 100644 (file)
--- a/gcc/graphite-scop-detection.c
+++ b/gcc/graphite-scop-detection.c
@@ -54,8 +54,7 @@ along with GCC; see the file COPYING3.  If not see
 #include <isl/map.h>
 #include <isl/union_map.h>
 
-#include "graphite-poly.h"
-#include "graphite-scop-detection.h"
+#include "graphite.h"
 
 class debug_printer
 {

diff --git a/gcc/graphite-scop-detection.h b/gcc/graphite-scop-detection.h
deleted file mode 100644 (file)
index 4511796..0000000
--- a/gcc/graphite-scop-detection.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Detection of Static Control Parts (SCoP) for Graphite.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
-   Contributed by Sebastian Pop <sebastian.pop@amd.com> and
-   Tobias Grosser <grosser@fim.uni-passau.de>.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING3.  If not see
-<http://www.gnu.org/licenses/>.  */
-
-#ifndef GCC_GRAPHITE_SCOP_DETECTION_H
-#define GCC_GRAPHITE_SCOP_DETECTION_H
-
-extern void build_scops (vec<scop_p> *);
-extern void dot_all_scops (vec<scop_p>);
-extern void dot_scop (scop_p);
-
-#endif /* GCC_GRAPHITE_SCOP_DETECTION_H */

diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
index ec7248b4417eb3e28502c4254605a97d52e040aa..e6802434137dad17f87670fa37ec1c0da4f8efd8 100644 (file)
--- a/gcc/graphite-sese-to-poly.c
+++ b/gcc/graphite-sese-to-poly.c
@@ -65,7 +65,7 @@ extern "C" {
 }
 #endif
 
-#include "graphite-poly.h"
+#include "graphite.h"
 
 /* Assigns to RES the value of the INTEGER_CST T.  */
 

diff --git a/gcc/graphite.c b/gcc/graphite.c
index ef7e64daf2f000639e41bee9d8a0cf4d691f046b..ee1d211711454a609afbb1f22cc787bd35314801 100644 (file)
--- a/gcc/graphite.c
+++ b/gcc/graphite.c
@@ -59,9 +59,7 @@ along with GCC; see the file COPYING3.  If not see
 #include <isl/options.h>
 #include <isl/union_map.h>
 
-#include "graphite-poly.h"
-#include "graphite-scop-detection.h"
-#include "graphite-isl-ast-to-gimple.h"
+#include "graphite.h"
 
 /* Print global statistics to FILE.  */
 

diff --git a/gcc/graphite-poly.h b/gcc/graphite.h
similarity index 98%
rename from gcc/graphite-poly.h
rename to gcc/graphite.h
index d396d3f7d64668edd8681a2184524e07557230c8..30272bbc46cb32723d986008d667218058add7f5 100644 (file)
--- a/gcc/graphite-poly.h
+++ b/gcc/graphite.h
@@ -461,6 +461,11 @@ carries_deps (__isl_keep isl_union_map *schedule,
              __isl_keep isl_union_map *deps,
              int depth);
 
-bool build_poly_scop (scop_p);
+extern bool build_poly_scop (scop_p);
+extern bool graphite_regenerate_ast_isl (scop_p);
+
+extern void build_scops (vec<scop_p> *);
+extern void dot_all_scops (vec<scop_p>);
+extern void dot_scop (scop_p);
 
 #endif