diff options
Diffstat (limited to 'main/gcc/074_all_gcc6_isl-dl.patch')
| -rw-r--r-- | main/gcc/074_all_gcc6_isl-dl.patch | 590 |
1 files changed, 0 insertions, 590 deletions
diff --git a/main/gcc/074_all_gcc6_isl-dl.patch b/main/gcc/074_all_gcc6_isl-dl.patch deleted file mode 100644 index 50f7c803bc..0000000000 --- a/main/gcc/074_all_gcc6_isl-dl.patch +++ /dev/null @@ -1,590 +0,0 @@ -dlopen cloog-isl library rather than link to it directly. This prevents -cloog upgrades that change the soname from breaking the compiler. - -http://pkgs.fedoraproject.org/cgit/rpms/gcc.git/plain/gcc6-isl-dl.patch - ---- a/gcc/Makefile.in.jj 2015-06-06 10:00:25.000000000 +0200 -+++ b/gcc/Makefile.in 2015-11-04 14:56:02.643536437 +0100 -@@ -1013,7 +1013,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY) - # and the system's installed libraries. - LIBS = @LIBS@ libcommon.a $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBBACKTRACE) \ - $(LIBIBERTY) $(LIBDECNUMBER) $(HOST_LIBS) --BACKENDLIBS = $(ISLLIBS) $(GMPLIBS) $(PLUGINLIBS) $(HOST_LIBS) \ -+BACKENDLIBS = $(if $(ISLLIBS),-ldl) $(GMPLIBS) $(PLUGINLIBS) $(HOST_LIBS) \ - $(ZLIB) - # Any system libraries needed just for GNAT. - SYSLIBS = @GNAT_LIBEXC@ -@@ -2058,6 +2058,15 @@ $(out_object_file): $(out_file) - $(common_out_object_file): $(common_out_file) - $(COMPILE) $< - $(POSTCOMPILE) -+ -+graphite%.o : \ -+ ALL_CFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CFLAGS)) -+graphite.o : \ -+ ALL_CFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CFLAGS)) -+graphite%.o : \ -+ ALL_CXXFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CXXFLAGS)) -+graphite.o : \ -+ ALL_CXXFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CXXFLAGS)) - # - # Generate header and source files from the machine description, - # and compile them. ---- a/gcc/graphite.h.jj 2016-01-27 12:44:06.000000000 +0100 -+++ b/gcc/graphite.h 2016-01-27 13:26:38.309876856 +0100 -@@ -36,6 +36,7 @@ along with GCC; see the file COPYING3. - #include <isl/ilp.h> - #include <isl/schedule.h> - #include <isl/ast_build.h> -+#include <dlfcn.h> - - #ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS - /* isl 0.15 or later. */ -@@ -47,6 +48,494 @@ along with GCC; see the file COPYING3. - # define isl_stat_ok 0 - #endif - -+#ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS -+#define DYNSYM_SCHEDULE_FUSE DYNSYM (isl_options_set_schedule_serialize_sccs) -+#define DYNSYM_SET_YAML_STYLE DYNSYM (isl_printer_set_yaml_style); -+#else -+#define DYNSYM_SCHEDULE_FUSE DYNSYM (isl_options_set_schedule_fuse) -+#define DYNSYM_SET_YAML_STYLE -+#endif -+ -+#define DYNSYMS \ -+ DYNSYM (isl_aff_add_coefficient_si); \ -+ DYNSYM (isl_aff_free); \ -+ DYNSYM (isl_aff_get_space); \ -+ DYNSYM (isl_aff_set_coefficient_si); \ -+ DYNSYM (isl_aff_set_constant_si); \ -+ DYNSYM (isl_aff_zero_on_domain); \ -+ DYNSYM (isl_band_free); \ -+ DYNSYM (isl_band_get_children); \ -+ DYNSYM (isl_band_get_partial_schedule); \ -+ DYNSYM (isl_band_has_children); \ -+ DYNSYM (isl_band_list_free); \ -+ DYNSYM (isl_band_list_get_band); \ -+ DYNSYM (isl_band_list_get_ctx); \ -+ DYNSYM (isl_band_list_n_band); \ -+ DYNSYM (isl_band_n_member); \ -+ DYNSYM (isl_basic_map_add_constraint); \ -+ DYNSYM (isl_basic_map_project_out); \ -+ DYNSYM (isl_basic_map_universe); \ -+ DYNSYM (isl_constraint_set_coefficient_si); \ -+ DYNSYM (isl_constraint_set_constant_si); \ -+ DYNSYM (isl_ctx_alloc); \ -+ DYNSYM (isl_ctx_free); \ -+ DYNSYM (isl_equality_alloc); \ -+ DYNSYM (isl_id_alloc); \ -+ DYNSYM (isl_id_copy); \ -+ DYNSYM (isl_id_free); \ -+ DYNSYM (isl_inequality_alloc); \ -+ DYNSYM (isl_local_space_copy); \ -+ DYNSYM (isl_local_space_free); \ -+ DYNSYM (isl_local_space_from_space); \ -+ DYNSYM (isl_local_space_range); \ -+ DYNSYM (isl_map_add_constraint); \ -+ DYNSYM (isl_map_add_dims); \ -+ DYNSYM (isl_map_align_params); \ -+ DYNSYM (isl_map_apply_range); \ -+ DYNSYM (isl_map_copy); \ -+ DYNSYM (isl_map_dim); \ -+ DYNSYM (isl_map_dump); \ -+ DYNSYM (isl_map_equate); \ -+ DYNSYM (isl_map_fix_si); \ -+ DYNSYM (isl_map_flat_product); \ -+ DYNSYM (isl_map_flat_range_product); \ -+ DYNSYM (isl_map_free); \ -+ DYNSYM (isl_map_from_basic_map); \ -+ DYNSYM (isl_map_from_pw_aff); \ -+ DYNSYM (isl_map_from_union_map); \ -+ DYNSYM (isl_map_get_ctx); \ -+ DYNSYM (isl_map_get_space); \ -+ DYNSYM (isl_map_get_tuple_id); \ -+ DYNSYM (isl_map_insert_dims); \ -+ DYNSYM (isl_map_intersect); \ -+ DYNSYM (isl_map_intersect_domain); \ -+ DYNSYM (isl_map_intersect_range); \ -+ DYNSYM (isl_map_is_empty); \ -+ DYNSYM (isl_map_lex_ge); \ -+ DYNSYM (isl_map_lex_le); \ -+ DYNSYM (isl_map_n_out); \ -+ DYNSYM (isl_map_range); \ -+ DYNSYM (isl_map_set_tuple_id); \ -+ DYNSYM (isl_map_universe); \ -+ DYNSYM (isl_options_set_on_error); \ -+ DYNSYM_SCHEDULE_FUSE; \ -+ DYNSYM_SET_YAML_STYLE \ -+ DYNSYM (isl_options_set_schedule_max_constant_term); \ -+ DYNSYM (isl_options_set_schedule_maximize_band_depth); \ -+ DYNSYM (isl_printer_free); \ -+ DYNSYM (isl_printer_print_aff); \ -+ DYNSYM (isl_printer_print_constraint); \ -+ DYNSYM (isl_printer_print_map); \ -+ DYNSYM (isl_printer_print_set); \ -+ DYNSYM (isl_printer_to_file); \ -+ DYNSYM (isl_pw_aff_add); \ -+ DYNSYM (isl_pw_aff_alloc); \ -+ DYNSYM (isl_pw_aff_copy); \ -+ DYNSYM (isl_pw_aff_eq_set); \ -+ DYNSYM (isl_pw_aff_free); \ -+ DYNSYM (isl_pw_aff_from_aff); \ -+ DYNSYM (isl_pw_aff_ge_set); \ -+ DYNSYM (isl_pw_aff_gt_set); \ -+ DYNSYM (isl_pw_aff_is_cst); \ -+ DYNSYM (isl_pw_aff_le_set); \ -+ DYNSYM (isl_pw_aff_lt_set); \ -+ DYNSYM (isl_pw_aff_mul); \ -+ DYNSYM (isl_pw_aff_ne_set); \ -+ DYNSYM (isl_pw_aff_nonneg_set); \ -+ DYNSYM (isl_pw_aff_set_tuple_id); \ -+ DYNSYM (isl_pw_aff_sub); \ -+ DYNSYM (isl_pw_aff_zero_set); \ -+ DYNSYM (isl_schedule_free); \ -+ DYNSYM (isl_schedule_get_band_forest); \ -+ DYNSYM (isl_set_add_constraint); \ -+ DYNSYM (isl_set_add_dims); \ -+ DYNSYM (isl_set_apply); \ -+ DYNSYM (isl_set_coalesce); \ -+ DYNSYM (isl_set_copy); \ -+ DYNSYM (isl_set_dim); \ -+ DYNSYM (isl_set_fix_si); \ -+ DYNSYM (isl_set_free); \ -+ DYNSYM (isl_set_get_space); \ -+ DYNSYM (isl_set_get_tuple_id); \ -+ DYNSYM (isl_set_intersect); \ -+ DYNSYM (isl_set_is_empty); \ -+ DYNSYM (isl_set_n_dim); \ -+ DYNSYM (isl_set_nat_universe); \ -+ DYNSYM (isl_set_project_out); \ -+ DYNSYM (isl_set_set_tuple_id); \ -+ DYNSYM (isl_set_universe); \ -+ DYNSYM (isl_space_add_dims); \ -+ DYNSYM (isl_space_alloc); \ -+ DYNSYM (isl_space_copy); \ -+ DYNSYM (isl_space_dim); \ -+ DYNSYM (isl_space_domain); \ -+ DYNSYM (isl_space_find_dim_by_id); \ -+ DYNSYM (isl_space_free); \ -+ DYNSYM (isl_space_from_domain); \ -+ DYNSYM (isl_space_get_tuple_id); \ -+ DYNSYM (isl_space_params_alloc); \ -+ DYNSYM (isl_space_range); \ -+ DYNSYM (isl_space_set_alloc); \ -+ DYNSYM (isl_space_set_dim_id); \ -+ DYNSYM (isl_space_set_tuple_id); \ -+ DYNSYM (isl_union_map_add_map); \ -+ DYNSYM (isl_union_map_align_params); \ -+ DYNSYM (isl_union_map_apply_domain); \ -+ DYNSYM (isl_union_map_apply_range); \ -+ DYNSYM (isl_union_map_compute_flow); \ -+ DYNSYM (isl_union_map_copy); \ -+ DYNSYM (isl_union_map_empty); \ -+ DYNSYM (isl_union_map_flat_range_product); \ -+ DYNSYM (isl_union_map_foreach_map); \ -+ DYNSYM (isl_union_map_free); \ -+ DYNSYM (isl_union_map_from_map); \ -+ DYNSYM (isl_union_map_get_ctx); \ -+ DYNSYM (isl_union_map_get_space); \ -+ DYNSYM (isl_union_map_gist_domain); \ -+ DYNSYM (isl_union_map_gist_range); \ -+ DYNSYM (isl_union_map_intersect_domain); \ -+ DYNSYM (isl_union_map_is_empty); \ -+ DYNSYM (isl_union_map_subtract); \ -+ DYNSYM (isl_union_map_union); \ -+ DYNSYM (isl_union_set_add_set); \ -+ DYNSYM (isl_union_set_compute_schedule); \ -+ DYNSYM (isl_union_set_copy); \ -+ DYNSYM (isl_union_set_empty); \ -+ DYNSYM (isl_union_set_from_set); \ -+ DYNSYM (isl_aff_add_constant_val); \ -+ DYNSYM (isl_aff_get_coefficient_val); \ -+ DYNSYM (isl_aff_get_ctx); \ -+ DYNSYM (isl_aff_mod_val); \ -+ DYNSYM (isl_ast_build_ast_from_schedule); \ -+ DYNSYM (isl_ast_build_free); \ -+ DYNSYM (isl_ast_build_from_context); \ -+ DYNSYM (isl_ast_build_get_ctx); \ -+ DYNSYM (isl_ast_build_get_schedule); \ -+ DYNSYM (isl_ast_build_get_schedule_space); \ -+ DYNSYM (isl_ast_build_set_before_each_for); \ -+ DYNSYM (isl_ast_build_set_options); \ -+ DYNSYM (isl_ast_expr_free); \ -+ DYNSYM (isl_ast_expr_from_val); \ -+ DYNSYM (isl_ast_expr_get_ctx); \ -+ DYNSYM (isl_ast_expr_get_id); \ -+ DYNSYM (isl_ast_expr_get_op_arg); \ -+ DYNSYM (isl_ast_expr_get_op_n_arg); \ -+ DYNSYM (isl_ast_expr_get_op_type); \ -+ DYNSYM (isl_ast_expr_get_type); \ -+ DYNSYM (isl_ast_expr_get_val); \ -+ DYNSYM (isl_ast_expr_sub); \ -+ DYNSYM (isl_ast_node_block_get_children); \ -+ DYNSYM (isl_ast_node_for_get_body); \ -+ DYNSYM (isl_ast_node_for_get_cond); \ -+ DYNSYM (isl_ast_node_for_get_inc); \ -+ DYNSYM (isl_ast_node_for_get_init); \ -+ DYNSYM (isl_ast_node_for_get_iterator); \ -+ DYNSYM (isl_ast_node_free); \ -+ DYNSYM (isl_ast_node_get_annotation); \ -+ DYNSYM (isl_ast_node_get_type); \ -+ DYNSYM (isl_ast_node_if_get_cond); \ -+ DYNSYM (isl_ast_node_if_get_else); \ -+ DYNSYM (isl_ast_node_if_get_then); \ -+ DYNSYM (isl_ast_node_list_free); \ -+ DYNSYM (isl_ast_node_list_get_ast_node); \ -+ DYNSYM (isl_ast_node_list_n_ast_node); \ -+ DYNSYM (isl_ast_node_user_get_expr); \ -+ DYNSYM (isl_constraint_set_coefficient_val); \ -+ DYNSYM (isl_constraint_set_constant_val); \ -+ DYNSYM (isl_id_get_user); \ -+ DYNSYM (isl_local_space_get_ctx); \ -+ DYNSYM (isl_map_fix_val); \ -+ DYNSYM (isl_options_set_ast_build_atomic_upper_bound); \ -+ DYNSYM (isl_printer_print_ast_node); \ -+ DYNSYM (isl_printer_print_str); \ -+ DYNSYM (isl_printer_set_output_format); \ -+ DYNSYM (isl_pw_aff_mod_val); \ -+ DYNSYM (isl_schedule_constraints_compute_schedule); \ -+ DYNSYM (isl_schedule_constraints_on_domain); \ -+ DYNSYM (isl_schedule_constraints_set_coincidence); \ -+ DYNSYM (isl_schedule_constraints_set_proximity); \ -+ DYNSYM (isl_schedule_constraints_set_validity); \ -+ DYNSYM (isl_set_get_dim_id); \ -+ DYNSYM (isl_set_max_val); \ -+ DYNSYM (isl_set_min_val); \ -+ DYNSYM (isl_set_params); \ -+ DYNSYM (isl_space_align_params); \ -+ DYNSYM (isl_space_map_from_domain_and_range); \ -+ DYNSYM (isl_space_set_tuple_name); \ -+ DYNSYM (isl_space_wrap); \ -+ DYNSYM (isl_union_map_from_domain_and_range); \ -+ DYNSYM (isl_union_map_range); \ -+ DYNSYM (isl_union_set_union); \ -+ DYNSYM (isl_union_set_universe); \ -+ DYNSYM (isl_val_2exp); \ -+ DYNSYM (isl_val_add_ui); \ -+ DYNSYM (isl_val_copy); \ -+ DYNSYM (isl_val_free); \ -+ DYNSYM (isl_val_get_num_gmp); \ -+ DYNSYM (isl_val_int_from_gmp); \ -+ DYNSYM (isl_val_int_from_si); \ -+ DYNSYM (isl_val_int_from_ui); \ -+ DYNSYM (isl_val_mul); \ -+ DYNSYM (isl_val_neg); \ -+ DYNSYM (isl_val_sub); \ -+ DYNSYM (isl_printer_print_union_map); \ -+ DYNSYM (isl_pw_aff_get_ctx); \ -+ DYNSYM (isl_val_is_int); \ -+ DYNSYM (isl_ctx_get_max_operations); \ -+ DYNSYM (isl_ctx_set_max_operations); \ -+ DYNSYM (isl_ctx_last_error); \ -+ DYNSYM (isl_ctx_reset_operations); \ -+ DYNSYM (isl_map_coalesce); \ -+ DYNSYM (isl_printer_print_schedule); \ -+ DYNSYM (isl_set_set_dim_id); \ -+ DYNSYM (isl_union_map_coalesce); -+ -+extern struct isl_pointers_s__ -+{ -+ bool inited; -+ void *h; -+#define DYNSYM(x) __typeof (x) *p_##x -+ DYNSYMS -+#undef DYNSYM -+} isl_pointers__; -+ -+#define isl_aff_add_coefficient_si (*isl_pointers__.p_isl_aff_add_coefficient_si) -+#define isl_aff_free (*isl_pointers__.p_isl_aff_free) -+#define isl_aff_get_space (*isl_pointers__.p_isl_aff_get_space) -+#define isl_aff_set_coefficient_si (*isl_pointers__.p_isl_aff_set_coefficient_si) -+#define isl_aff_set_constant_si (*isl_pointers__.p_isl_aff_set_constant_si) -+#define isl_aff_zero_on_domain (*isl_pointers__.p_isl_aff_zero_on_domain) -+#define isl_band_free (*isl_pointers__.p_isl_band_free) -+#define isl_band_get_children (*isl_pointers__.p_isl_band_get_children) -+#define isl_band_get_partial_schedule (*isl_pointers__.p_isl_band_get_partial_schedule) -+#define isl_band_has_children (*isl_pointers__.p_isl_band_has_children) -+#define isl_band_list_free (*isl_pointers__.p_isl_band_list_free) -+#define isl_band_list_get_band (*isl_pointers__.p_isl_band_list_get_band) -+#define isl_band_list_get_ctx (*isl_pointers__.p_isl_band_list_get_ctx) -+#define isl_band_list_n_band (*isl_pointers__.p_isl_band_list_n_band) -+#define isl_band_n_member (*isl_pointers__.p_isl_band_n_member) -+#define isl_basic_map_add_constraint (*isl_pointers__.p_isl_basic_map_add_constraint) -+#define isl_basic_map_project_out (*isl_pointers__.p_isl_basic_map_project_out) -+#define isl_basic_map_universe (*isl_pointers__.p_isl_basic_map_universe) -+#define isl_constraint_set_coefficient_si (*isl_pointers__.p_isl_constraint_set_coefficient_si) -+#define isl_constraint_set_constant_si (*isl_pointers__.p_isl_constraint_set_constant_si) -+#define isl_ctx_alloc (*isl_pointers__.p_isl_ctx_alloc) -+#define isl_ctx_free (*isl_pointers__.p_isl_ctx_free) -+#define isl_equality_alloc (*isl_pointers__.p_isl_equality_alloc) -+#define isl_id_alloc (*isl_pointers__.p_isl_id_alloc) -+#define isl_id_copy (*isl_pointers__.p_isl_id_copy) -+#define isl_id_free (*isl_pointers__.p_isl_id_free) -+#define isl_inequality_alloc (*isl_pointers__.p_isl_inequality_alloc) -+#define isl_local_space_copy (*isl_pointers__.p_isl_local_space_copy) -+#define isl_local_space_free (*isl_pointers__.p_isl_local_space_free) -+#define isl_local_space_from_space (*isl_pointers__.p_isl_local_space_from_space) -+#define isl_local_space_range (*isl_pointers__.p_isl_local_space_range) -+#define isl_map_add_constraint (*isl_pointers__.p_isl_map_add_constraint) -+#define isl_map_add_dims (*isl_pointers__.p_isl_map_add_dims) -+#define isl_map_align_params (*isl_pointers__.p_isl_map_align_params) -+#define isl_map_apply_range (*isl_pointers__.p_isl_map_apply_range) -+#define isl_map_copy (*isl_pointers__.p_isl_map_copy) -+#define isl_map_dim (*isl_pointers__.p_isl_map_dim) -+#define isl_map_dump (*isl_pointers__.p_isl_map_dump) -+#define isl_map_equate (*isl_pointers__.p_isl_map_equate) -+#define isl_map_fix_si (*isl_pointers__.p_isl_map_fix_si) -+#define isl_map_flat_product (*isl_pointers__.p_isl_map_flat_product) -+#define isl_map_flat_range_product (*isl_pointers__.p_isl_map_flat_range_product) -+#define isl_map_free (*isl_pointers__.p_isl_map_free) -+#define isl_map_from_basic_map (*isl_pointers__.p_isl_map_from_basic_map) -+#define isl_map_from_pw_aff (*isl_pointers__.p_isl_map_from_pw_aff) -+#define isl_map_from_union_map (*isl_pointers__.p_isl_map_from_union_map) -+#define isl_map_get_ctx (*isl_pointers__.p_isl_map_get_ctx) -+#define isl_map_get_space (*isl_pointers__.p_isl_map_get_space) -+#define isl_map_get_tuple_id (*isl_pointers__.p_isl_map_get_tuple_id) -+#define isl_map_insert_dims (*isl_pointers__.p_isl_map_insert_dims) -+#define isl_map_intersect (*isl_pointers__.p_isl_map_intersect) -+#define isl_map_intersect_domain (*isl_pointers__.p_isl_map_intersect_domain) -+#define isl_map_intersect_range (*isl_pointers__.p_isl_map_intersect_range) -+#define isl_map_is_empty (*isl_pointers__.p_isl_map_is_empty) -+#define isl_map_lex_ge (*isl_pointers__.p_isl_map_lex_ge) -+#define isl_map_lex_le (*isl_pointers__.p_isl_map_lex_le) -+#define isl_map_n_out (*isl_pointers__.p_isl_map_n_out) -+#define isl_map_range (*isl_pointers__.p_isl_map_range) -+#define isl_map_set_tuple_id (*isl_pointers__.p_isl_map_set_tuple_id) -+#define isl_map_universe (*isl_pointers__.p_isl_map_universe) -+#define isl_options_set_on_error (*isl_pointers__.p_isl_options_set_on_error) -+#ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS -+#define isl_options_set_schedule_serialize_sccs (*isl_pointers__.p_isl_options_set_schedule_serialize_sccs) -+#define isl_printer_set_yaml_style (*isl_pointers__.p_isl_printer_set_yaml_style) -+#else -+#define isl_options_set_schedule_fuse (*isl_pointers__.p_isl_options_set_schedule_fuse) -+#endif -+#define isl_options_set_schedule_max_constant_term (*isl_pointers__.p_isl_options_set_schedule_max_constant_term) -+#define isl_options_set_schedule_maximize_band_depth (*isl_pointers__.p_isl_options_set_schedule_maximize_band_depth) -+#define isl_printer_free (*isl_pointers__.p_isl_printer_free) -+#define isl_printer_print_aff (*isl_pointers__.p_isl_printer_print_aff) -+#define isl_printer_print_constraint (*isl_pointers__.p_isl_printer_print_constraint) -+#define isl_printer_print_map (*isl_pointers__.p_isl_printer_print_map) -+#define isl_printer_print_set (*isl_pointers__.p_isl_printer_print_set) -+#define isl_printer_to_file (*isl_pointers__.p_isl_printer_to_file) -+#define isl_pw_aff_add (*isl_pointers__.p_isl_pw_aff_add) -+#define isl_pw_aff_alloc (*isl_pointers__.p_isl_pw_aff_alloc) -+#define isl_pw_aff_copy (*isl_pointers__.p_isl_pw_aff_copy) -+#define isl_pw_aff_eq_set (*isl_pointers__.p_isl_pw_aff_eq_set) -+#define isl_pw_aff_free (*isl_pointers__.p_isl_pw_aff_free) -+#define isl_pw_aff_from_aff (*isl_pointers__.p_isl_pw_aff_from_aff) -+#define isl_pw_aff_ge_set (*isl_pointers__.p_isl_pw_aff_ge_set) -+#define isl_pw_aff_gt_set (*isl_pointers__.p_isl_pw_aff_gt_set) -+#define isl_pw_aff_is_cst (*isl_pointers__.p_isl_pw_aff_is_cst) -+#define isl_pw_aff_le_set (*isl_pointers__.p_isl_pw_aff_le_set) -+#define isl_pw_aff_lt_set (*isl_pointers__.p_isl_pw_aff_lt_set) -+#define isl_pw_aff_mul (*isl_pointers__.p_isl_pw_aff_mul) -+#define isl_pw_aff_ne_set (*isl_pointers__.p_isl_pw_aff_ne_set) -+#define isl_pw_aff_nonneg_set (*isl_pointers__.p_isl_pw_aff_nonneg_set) -+#define isl_pw_aff_set_tuple_id (*isl_pointers__.p_isl_pw_aff_set_tuple_id) -+#define isl_pw_aff_sub (*isl_pointers__.p_isl_pw_aff_sub) -+#define isl_pw_aff_zero_set (*isl_pointers__.p_isl_pw_aff_zero_set) -+#define isl_schedule_free (*isl_pointers__.p_isl_schedule_free) -+#define isl_schedule_get_band_forest (*isl_pointers__.p_isl_schedule_get_band_forest) -+#define isl_set_add_constraint (*isl_pointers__.p_isl_set_add_constraint) -+#define isl_set_add_dims (*isl_pointers__.p_isl_set_add_dims) -+#define isl_set_apply (*isl_pointers__.p_isl_set_apply) -+#define isl_set_coalesce (*isl_pointers__.p_isl_set_coalesce) -+#define isl_set_copy (*isl_pointers__.p_isl_set_copy) -+#define isl_set_dim (*isl_pointers__.p_isl_set_dim) -+#define isl_set_fix_si (*isl_pointers__.p_isl_set_fix_si) -+#define isl_set_free (*isl_pointers__.p_isl_set_free) -+#define isl_set_get_space (*isl_pointers__.p_isl_set_get_space) -+#define isl_set_get_tuple_id (*isl_pointers__.p_isl_set_get_tuple_id) -+#define isl_set_intersect (*isl_pointers__.p_isl_set_intersect) -+#define isl_set_is_empty (*isl_pointers__.p_isl_set_is_empty) -+#define isl_set_n_dim (*isl_pointers__.p_isl_set_n_dim) -+#define isl_set_nat_universe (*isl_pointers__.p_isl_set_nat_universe) -+#define isl_set_project_out (*isl_pointers__.p_isl_set_project_out) -+#define isl_set_set_tuple_id (*isl_pointers__.p_isl_set_set_tuple_id) -+#define isl_set_universe (*isl_pointers__.p_isl_set_universe) -+#define isl_space_add_dims (*isl_pointers__.p_isl_space_add_dims) -+#define isl_space_alloc (*isl_pointers__.p_isl_space_alloc) -+#define isl_space_copy (*isl_pointers__.p_isl_space_copy) -+#define isl_space_dim (*isl_pointers__.p_isl_space_dim) -+#define isl_space_domain (*isl_pointers__.p_isl_space_domain) -+#define isl_space_find_dim_by_id (*isl_pointers__.p_isl_space_find_dim_by_id) -+#define isl_space_free (*isl_pointers__.p_isl_space_free) -+#define isl_space_from_domain (*isl_pointers__.p_isl_space_from_domain) -+#define isl_space_get_tuple_id (*isl_pointers__.p_isl_space_get_tuple_id) -+#define isl_space_params_alloc (*isl_pointers__.p_isl_space_params_alloc) -+#define isl_space_range (*isl_pointers__.p_isl_space_range) -+#define isl_space_set_alloc (*isl_pointers__.p_isl_space_set_alloc) -+#define isl_space_set_dim_id (*isl_pointers__.p_isl_space_set_dim_id) -+#define isl_space_set_tuple_id (*isl_pointers__.p_isl_space_set_tuple_id) -+#define isl_union_map_add_map (*isl_pointers__.p_isl_union_map_add_map) -+#define isl_union_map_align_params (*isl_pointers__.p_isl_union_map_align_params) -+#define isl_union_map_apply_domain (*isl_pointers__.p_isl_union_map_apply_domain) -+#define isl_union_map_apply_range (*isl_pointers__.p_isl_union_map_apply_range) -+#define isl_union_map_compute_flow (*isl_pointers__.p_isl_union_map_compute_flow) -+#define isl_union_map_copy (*isl_pointers__.p_isl_union_map_copy) -+#define isl_union_map_empty (*isl_pointers__.p_isl_union_map_empty) -+#define isl_union_map_flat_range_product (*isl_pointers__.p_isl_union_map_flat_range_product) -+#define isl_union_map_foreach_map (*isl_pointers__.p_isl_union_map_foreach_map) -+#define isl_union_map_free (*isl_pointers__.p_isl_union_map_free) -+#define isl_union_map_from_map (*isl_pointers__.p_isl_union_map_from_map) -+#define isl_union_map_get_ctx (*isl_pointers__.p_isl_union_map_get_ctx) -+#define isl_union_map_get_space (*isl_pointers__.p_isl_union_map_get_space) -+#define isl_union_map_gist_domain (*isl_pointers__.p_isl_union_map_gist_domain) -+#define isl_union_map_gist_range (*isl_pointers__.p_isl_union_map_gist_range) -+#define isl_union_map_intersect_domain (*isl_pointers__.p_isl_union_map_intersect_domain) -+#define isl_union_map_is_empty (*isl_pointers__.p_isl_union_map_is_empty) -+#define isl_union_map_subtract (*isl_pointers__.p_isl_union_map_subtract) -+#define isl_union_map_union (*isl_pointers__.p_isl_union_map_union) -+#define isl_union_set_add_set (*isl_pointers__.p_isl_union_set_add_set) -+#define isl_union_set_compute_schedule (*isl_pointers__.p_isl_union_set_compute_schedule) -+#define isl_union_set_copy (*isl_pointers__.p_isl_union_set_copy) -+#define isl_union_set_empty (*isl_pointers__.p_isl_union_set_empty) -+#define isl_union_set_from_set (*isl_pointers__.p_isl_union_set_from_set) -+#define isl_aff_add_constant_val (*isl_pointers__.p_isl_aff_add_constant_val) -+#define isl_aff_get_coefficient_val (*isl_pointers__.p_isl_aff_get_coefficient_val) -+#define isl_aff_get_ctx (*isl_pointers__.p_isl_aff_get_ctx) -+#define isl_aff_mod_val (*isl_pointers__.p_isl_aff_mod_val) -+#define isl_ast_build_ast_from_schedule (*isl_pointers__.p_isl_ast_build_ast_from_schedule) -+#define isl_ast_build_free (*isl_pointers__.p_isl_ast_build_free) -+#define isl_ast_build_from_context (*isl_pointers__.p_isl_ast_build_from_context) -+#define isl_ast_build_get_ctx (*isl_pointers__.p_isl_ast_build_get_ctx) -+#define isl_ast_build_get_schedule (*isl_pointers__.p_isl_ast_build_get_schedule) -+#define isl_ast_build_get_schedule_space (*isl_pointers__.p_isl_ast_build_get_schedule_space) -+#define isl_ast_build_set_before_each_for (*isl_pointers__.p_isl_ast_build_set_before_each_for) -+#define isl_ast_build_set_options (*isl_pointers__.p_isl_ast_build_set_options) -+#define isl_ast_expr_free (*isl_pointers__.p_isl_ast_expr_free) -+#define isl_ast_expr_from_val (*isl_pointers__.p_isl_ast_expr_from_val) -+#define isl_ast_expr_get_ctx (*isl_pointers__.p_isl_ast_expr_get_ctx) -+#define isl_ast_expr_get_id (*isl_pointers__.p_isl_ast_expr_get_id) -+#define isl_ast_expr_get_op_arg (*isl_pointers__.p_isl_ast_expr_get_op_arg) -+#define isl_ast_expr_get_op_n_arg (*isl_pointers__.p_isl_ast_expr_get_op_n_arg) -+#define isl_ast_expr_get_op_type (*isl_pointers__.p_isl_ast_expr_get_op_type) -+#define isl_ast_expr_get_type (*isl_pointers__.p_isl_ast_expr_get_type) -+#define isl_ast_expr_get_val (*isl_pointers__.p_isl_ast_expr_get_val) -+#define isl_ast_expr_sub (*isl_pointers__.p_isl_ast_expr_sub) -+#define isl_ast_node_block_get_children (*isl_pointers__.p_isl_ast_node_block_get_children) -+#define isl_ast_node_for_get_body (*isl_pointers__.p_isl_ast_node_for_get_body) -+#define isl_ast_node_for_get_cond (*isl_pointers__.p_isl_ast_node_for_get_cond) -+#define isl_ast_node_for_get_inc (*isl_pointers__.p_isl_ast_node_for_get_inc) -+#define isl_ast_node_for_get_init (*isl_pointers__.p_isl_ast_node_for_get_init) -+#define isl_ast_node_for_get_iterator (*isl_pointers__.p_isl_ast_node_for_get_iterator) -+#define isl_ast_node_free (*isl_pointers__.p_isl_ast_node_free) -+#define isl_ast_node_get_annotation (*isl_pointers__.p_isl_ast_node_get_annotation) -+#define isl_ast_node_get_type (*isl_pointers__.p_isl_ast_node_get_type) -+#define isl_ast_node_if_get_cond (*isl_pointers__.p_isl_ast_node_if_get_cond) -+#define isl_ast_node_if_get_else (*isl_pointers__.p_isl_ast_node_if_get_else) -+#define isl_ast_node_if_get_then (*isl_pointers__.p_isl_ast_node_if_get_then) -+#define isl_ast_node_list_free (*isl_pointers__.p_isl_ast_node_list_free) -+#define isl_ast_node_list_get_ast_node (*isl_pointers__.p_isl_ast_node_list_get_ast_node) -+#define isl_ast_node_list_n_ast_node (*isl_pointers__.p_isl_ast_node_list_n_ast_node) -+#define isl_ast_node_user_get_expr (*isl_pointers__.p_isl_ast_node_user_get_expr) -+#define isl_constraint_set_coefficient_val (*isl_pointers__.p_isl_constraint_set_coefficient_val) -+#define isl_constraint_set_constant_val (*isl_pointers__.p_isl_constraint_set_constant_val) -+#define isl_id_get_user (*isl_pointers__.p_isl_id_get_user) -+#define isl_local_space_get_ctx (*isl_pointers__.p_isl_local_space_get_ctx) -+#define isl_map_fix_val (*isl_pointers__.p_isl_map_fix_val) -+#define isl_options_set_ast_build_atomic_upper_bound (*isl_pointers__.p_isl_options_set_ast_build_atomic_upper_bound) -+#define isl_printer_print_ast_node (*isl_pointers__.p_isl_printer_print_ast_node) -+#define isl_printer_print_str (*isl_pointers__.p_isl_printer_print_str) -+#define isl_printer_set_output_format (*isl_pointers__.p_isl_printer_set_output_format) -+#define isl_pw_aff_mod_val (*isl_pointers__.p_isl_pw_aff_mod_val) -+#define isl_schedule_constraints_compute_schedule (*isl_pointers__.p_isl_schedule_constraints_compute_schedule) -+#define isl_schedule_constraints_on_domain (*isl_pointers__.p_isl_schedule_constraints_on_domain) -+#define isl_schedule_constraints_set_coincidence (*isl_pointers__.p_isl_schedule_constraints_set_coincidence) -+#define isl_schedule_constraints_set_proximity (*isl_pointers__.p_isl_schedule_constraints_set_proximity) -+#define isl_schedule_constraints_set_validity (*isl_pointers__.p_isl_schedule_constraints_set_validity) -+#define isl_set_get_dim_id (*isl_pointers__.p_isl_set_get_dim_id) -+#define isl_set_max_val (*isl_pointers__.p_isl_set_max_val) -+#define isl_set_min_val (*isl_pointers__.p_isl_set_min_val) -+#define isl_set_params (*isl_pointers__.p_isl_set_params) -+#define isl_space_align_params (*isl_pointers__.p_isl_space_align_params) -+#define isl_space_map_from_domain_and_range (*isl_pointers__.p_isl_space_map_from_domain_and_range) -+#define isl_space_set_tuple_name (*isl_pointers__.p_isl_space_set_tuple_name) -+#define isl_space_wrap (*isl_pointers__.p_isl_space_wrap) -+#define isl_union_map_from_domain_and_range (*isl_pointers__.p_isl_union_map_from_domain_and_range) -+#define isl_union_map_range (*isl_pointers__.p_isl_union_map_range) -+#define isl_union_set_union (*isl_pointers__.p_isl_union_set_union) -+#define isl_union_set_universe (*isl_pointers__.p_isl_union_set_universe) -+#define isl_val_2exp (*isl_pointers__.p_isl_val_2exp) -+#define isl_val_add_ui (*isl_pointers__.p_isl_val_add_ui) -+#define isl_val_copy (*isl_pointers__.p_isl_val_copy) -+#define isl_val_free (*isl_pointers__.p_isl_val_free) -+#define isl_val_get_num_gmp (*isl_pointers__.p_isl_val_get_num_gmp) -+#define isl_val_int_from_gmp (*isl_pointers__.p_isl_val_int_from_gmp) -+#define isl_val_int_from_si (*isl_pointers__.p_isl_val_int_from_si) -+#define isl_val_int_from_ui (*isl_pointers__.p_isl_val_int_from_ui) -+#define isl_val_mul (*isl_pointers__.p_isl_val_mul) -+#define isl_val_neg (*isl_pointers__.p_isl_val_neg) -+#define isl_val_sub (*isl_pointers__.p_isl_val_sub) -+#define isl_printer_print_union_map (*isl_pointers__.p_isl_printer_print_union_map) -+#define isl_pw_aff_get_ctx (*isl_pointers__.p_isl_pw_aff_get_ctx) -+#define isl_val_is_int (*isl_pointers__.p_isl_val_is_int) -+#define isl_ctx_get_max_operations (*isl_pointers__.p_isl_ctx_get_max_operations) -+#define isl_ctx_set_max_operations (*isl_pointers__.p_isl_ctx_set_max_operations) -+#define isl_ctx_last_error (*isl_pointers__.p_isl_ctx_last_error) -+#define isl_ctx_reset_operations (*isl_pointers__.p_isl_ctx_reset_operations) -+#define isl_map_coalesce (*isl_pointers__.p_isl_map_coalesce) -+#define isl_printer_print_schedule (*isl_pointers__.p_isl_printer_print_schedule) -+#define isl_set_set_dim_id (*isl_pointers__.p_isl_set_set_dim_id) -+#define isl_union_map_coalesce (*isl_pointers__.p_isl_union_map_coalesce) -+ - typedef struct poly_dr *poly_dr_p; - - typedef struct poly_bb *poly_bb_p; ---- a/gcc/graphite.c.jj 2015-11-04 14:15:32.000000000 +0100 -+++ b/gcc/graphite.c 2015-11-04 14:56:02.645536409 +0100 -@@ -54,6 +54,34 @@ along with GCC; see the file COPYING3. - #include "tree-cfgcleanup.h" - #include "graphite.h" - -+__typeof (isl_pointers__) isl_pointers__; -+ -+static bool -+init_isl_pointers (void) -+{ -+ void *h; -+ -+ if (isl_pointers__.inited) -+ return isl_pointers__.h != NULL; -+ h = dlopen ("libisl.so.13", RTLD_LAZY); -+ isl_pointers__.h = h; -+ if (h == NULL) -+ return false; -+#define DYNSYM(x) \ -+ do \ -+ { \ -+ union { __typeof (isl_pointers__.p_##x) p; void *q; } u; \ -+ u.q = dlsym (h, #x); \ -+ if (u.q == NULL) \ -+ return false; \ -+ isl_pointers__.p_##x = u.p; \ -+ } \ -+ while (0) -+ DYNSYMS -+#undef DYNSYM -+ return true; -+} -+ - /* Print global statistics to FILE. */ - - static void -@@ -298,6 +326,15 @@ graphite_transform_loops (void) - if (parallelized_function_p (cfun->decl)) - return; - -+ if (number_of_loops (cfun) <= 1) -+ return; -+ -+ if (!init_isl_pointers ()) -+ { -+ sorry ("Graphite loop optimizations cannot be used"); -+ return; -+ } -+ - ctx = isl_ctx_alloc (); - isl_options_set_on_error (ctx, ISL_ON_ERROR_ABORT); - if (!graphite_initialize (ctx)) |