diff options
| author | David Edelsohn <dje@gcc.gnu.org> | 2015-11-23 09:23:59 -0500 |
|---|---|---|
| committer | David Edelsohn <dje@gcc.gnu.org> | 2015-11-23 09:23:59 -0500 |
| commit | 4d776011993936d5e17421abe228b856f8e5e748 (patch) | |
| tree | 8b552b61a1b1ac6b4ce298f12409fda5177e3c16 /gcc/graphite-sese-to-poly.c | |
| parent | 546e500c8f90f9adf4187d07f8e6d33d82194f3c (diff) | |
Correct graphite*.c ISL header file inclusion order.
* system.h: Don't poison calloc and strdup if USES_ISL is defined.
* graphite-dependences.c: Define USES_ISL. Include ISL header files
after GCC header files and before graphite header files.
* graphite-dependences.c: Same.
* 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.
From-SVN: r230759
Diffstat (limited to 'gcc/graphite-sese-to-poly.c')
| -rw-r--r-- | gcc/graphite-sese-to-poly.c | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c index 83acc4ac6ca..34aa4763c41 100644 --- a/gcc/graphite-sese-to-poly.c +++ b/gcc/graphite-sese-to-poly.c @@ -18,28 +18,11 @@ 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/>. */ +#define USES_ISL + #include "config.h" #ifdef HAVE_isl -/* Workaround for GMP 5.1.3 bug, see PR56019. */ -#include <stddef.h> - -#include <isl/constraint.h> -#include <isl/set.h> -#include <isl/map.h> -#include <isl/union_map.h> -#include <isl/constraint.h> -#include <isl/aff.h> -#include <isl/val.h> - -/* Since ISL-0.13, the extern is in val_gmp.h. */ -#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus) -extern "C" { -#endif -#include <isl/val_gmp.h> -#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus) -} -#endif #include "system.h" #include "coretypes.h" @@ -63,8 +46,26 @@ extern "C" { #include "tree-data-ref.h" #include "tree-scalar-evolution.h" #include "domwalk.h" -#include "graphite-poly.h" #include "tree-ssa-propagate.h" + +#include <isl/constraint.h> +#include <isl/set.h> +#include <isl/map.h> +#include <isl/union_map.h> +#include <isl/constraint.h> +#include <isl/aff.h> +#include <isl/val.h> + +/* Since ISL-0.13, the extern is in val_gmp.h. */ +#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus) +extern "C" { +#endif +#include <isl/val_gmp.h> +#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus) +} +#endif + +#include "graphite-poly.h" #include "graphite-sese-to-poly.h" /* Assigns to RES the value of the INTEGER_CST T. */ |