Attachment #229341 for bug #317211

View | Details | Raw Unified | Return to bug 317211
Collapse All | Expand All

Lines 914-920 BUILD_LIBDEPS= $(BUILD_LIBIBERTY) Link Here

(-)a/gcc/Makefile.in (-1 / +4 lines)
914	# How to link with both our special library facilities	914	# How to link with both our special library facilities
915	# and the system's installed libraries.	915	# and the system's installed libraries.
916	LIBS = @LIBS@ $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBIBERTY) $(LIBDECNUMBER)	916	LIBS = @LIBS@ $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBIBERTY) $(LIBDECNUMBER)
917	BACKENDLIBS = $(CLOOGLIBS) $(PPLLIBS) $(GMPLIBS)	917	BACKENDLIBS = $(GMPLIBS) $(if $(CLOOGLIBS),@DL_LIB@)
918	# Any system libraries needed just for GNAT.	918	# Any system libraries needed just for GNAT.
919	SYSLIBS = @GNAT_LIBEXC@	919	SYSLIBS = @GNAT_LIBEXC@
920		920
Lines 3061-3066 $(out_object_file): $(out_file) $(CONFIG_H) coretypes.h $(TM_H) $(TREE_H) \ Link Here
3061	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) \	3061	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
3062	$(out_file) $(OUTPUT_OPTION)	3062	$(out_file) $(OUTPUT_OPTION)
3063		3063
		3064	graphite.o : \
		3065	ALL_CFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CFLAGS))
		3066
3064	# Build auxiliary files that support ecoff format.	3067	# Build auxiliary files that support ecoff format.
3065	mips-tfile: mips-tfile.o version.o $(LIBDEPS)	3068	mips-tfile: mips-tfile.o version.o $(LIBDEPS)
3066	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mips-tfile.o version.o $(LIBS)	3069	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mips-tfile.o version.o $(LIBS)




# include <unistd.h>
#endif"

ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_LDFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN OBJDUMP ac_ct_OBJDUMP ac_ct_AR STRIP ac_ct_STRIP lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump gcc_cv_readelf libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs fortran_target_objs target_cpu_default GMPLIBS GMPINC PPLLIBS PPLINC CLOOGLIBS CLOOGINC DL_LIB LIBOBJS LTLIBOBJS'
ac_subst_files='language_hooks'
ac_pwd=`pwd`



fi

# Check how to dlopen
DL_LIB=
saved_LIBS="$LIBS"
echo "$as_me:$LINENO: checking for library containing dlopen" >&5
echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6
if test "${ac_cv_search_dlopen+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
else
  ac_func_search_save_LIBS=$LIBS
ac_cv_search_dlopen=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */

/* Override any gcc2 internal prototype to avoid an error.  */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
   builtin and then its argument prototype would still apply.  */
char dlopen ();
int
main ()
{
dlopen ();
  ;
  return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  (eval $ac_link) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest$ac_exeext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_dlopen="none required"
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

fi
rm -f conftest.err conftest.$ac_objext \
      conftest$ac_exeext conftest.$ac_ext
if test "$ac_cv_search_dlopen" = no; then
  for ac_lib in dl; do
    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */

/* Override any gcc2 internal prototype to avoid an error.  */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
   builtin and then its argument prototype would still apply.  */
char dlopen ();
int
main ()
{
dlopen ();
  ;
  return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  (eval $ac_link) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest$ac_exeext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_dlopen="-l$ac_lib"
break
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

fi
rm -f conftest.err conftest.$ac_objext \
      conftest$ac_exeext conftest.$ac_ext
  done
fi
LIBS=$ac_func_search_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
echo "${ECHO_T}$ac_cv_search_dlopen" >&6
if test "$ac_cv_search_dlopen" != no; then
  test "$ac_cv_search_dlopen" = "none required" || LIBS="$ac_cv_search_dlopen $LIBS"

fi

case $ac_cv_search_dlopen in
    no*) ;;
      *) DL_LIB=$ac_cv_search_dlopen ;;
esac

LIBS=$saved_LIBS

# Configure the subdirectories
# AC_CONFIG_SUBDIRS($subdirs)


s,@PPLINC@,$PPLINC,;t t
s,@CLOOGLIBS@,$CLOOGLIBS,;t t
s,@CLOOGINC@,$CLOOGINC,;t t
s,@DL_LIB@,$DL_LIB,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
/@language_hooks@/r $language_hooks




   AC_DEFINE(HAVE_cloog, 1, [Define if cloog is in use.])
fi

# Check how to dlopen
DL_LIB=
saved_LIBS="$LIBS"
AC_SEARCH_LIBS([dlopen], [dl])
case $ac_cv_search_dlopen in
    no*) ;;
      *) DL_LIB=$ac_cv_search_dlopen ;;
esac
AC_SUBST(DL_LIB)
LIBS=$saved_LIBS

# Configure the subdirectories
# AC_CONFIG_SUBDIRS($subdirs)





#include "cloog/cloog.h"
#include "graphite.h"

#include <dlfcn.h>
#define DYNSYMS \
  DYNSYM (cloog_block_alloc); \
  DYNSYM (cloog_block_list_free); \
  DYNSYM (cloog_block_list_malloc); \
  DYNSYM (cloog_clast_create); \
  DYNSYM (cloog_clast_free); \
  DYNSYM (cloog_domain_free); \
  DYNSYM (cloog_domain_matrix2domain); \
  DYNSYM (cloog_initialize); \
  DYNSYM (cloog_loop_malloc); \
  DYNSYM (cloog_matrix_alloc); \
  DYNSYM (cloog_matrix_copy); \
  DYNSYM (cloog_matrix_free); \
  DYNSYM (cloog_matrix_print); \
  DYNSYM (cloog_names_malloc); \
  DYNSYM (cloog_names_scalarize); \
  DYNSYM (cloog_options_free); \
  DYNSYM (cloog_options_malloc); \
  DYNSYM (cloog_program_dump_cloog); \
  DYNSYM (cloog_program_extract_scalars); \
  DYNSYM (cloog_program_free); \
  DYNSYM (cloog_program_generate); \
  DYNSYM (cloog_program_malloc); \
  DYNSYM (cloog_program_print); \
  DYNSYM (cloog_program_scatter); \
  DYNSYM (cloog_statement_alloc); \
  DYNSYM (ppl_finalize); \
  DYNSYM (pprint); \
  DYNSYM (stmt_block); \
  DYNSYM (stmt_for); \
  DYNSYM (stmt_guard); \
  DYNSYM (stmt_root); \
  DYNSYM (stmt_user);
static struct
{
  bool inited;
  void *h;
#define DYNSYM(x) __typeof (x) *p_##x
  DYNSYMS
#undef DYNSYM
} cloog_pointers;

#define cloog_block_alloc (*cloog_pointers.p_cloog_block_alloc)
#define cloog_block_list_free (*cloog_pointers.p_cloog_block_list_free)
#define cloog_block_list_malloc (*cloog_pointers.p_cloog_block_list_malloc)
#define cloog_clast_create (*cloog_pointers.p_cloog_clast_create)
#define cloog_clast_free (*cloog_pointers.p_cloog_clast_free)
#define cloog_domain_free (*cloog_pointers.p_cloog_domain_free)
#define cloog_domain_matrix2domain (*cloog_pointers.p_cloog_domain_matrix2domain)
#define cloog_initialize (*cloog_pointers.p_cloog_initialize)
#define cloog_loop_malloc (*cloog_pointers.p_cloog_loop_malloc)
#define cloog_matrix_alloc (*cloog_pointers.p_cloog_matrix_alloc)
#define cloog_matrix_copy (*cloog_pointers.p_cloog_matrix_copy)
#define cloog_matrix_free (*cloog_pointers.p_cloog_matrix_free)
#define cloog_matrix_print (*cloog_pointers.p_cloog_matrix_print)
#define cloog_names_malloc (*cloog_pointers.p_cloog_names_malloc)
#define cloog_names_scalarize (*cloog_pointers.p_cloog_names_scalarize)
#define cloog_options_free (*cloog_pointers.p_cloog_options_free)
#define cloog_options_malloc (*cloog_pointers.p_cloog_options_malloc)
#define cloog_program_dump_cloog (*cloog_pointers.p_cloog_program_dump_cloog)
#define cloog_program_extract_scalars (*cloog_pointers.p_cloog_program_extract_scalars)
#define cloog_program_free (*cloog_pointers.p_cloog_program_free)
#define cloog_program_generate (*cloog_pointers.p_cloog_program_generate)
#define cloog_program_malloc (*cloog_pointers.p_cloog_program_malloc)
#define cloog_program_print (*cloog_pointers.p_cloog_program_print)
#define cloog_program_scatter (*cloog_pointers.p_cloog_program_scatter)
#define cloog_statement_alloc (*cloog_pointers.p_cloog_statement_alloc)
#define ppl_finalize (*cloog_pointers.p_ppl_finalize)
#define pprint (*cloog_pointers.p_pprint)
#define stmt_block (*cloog_pointers.p_stmt_block)
#define stmt_for (*cloog_pointers.p_stmt_for)
#define stmt_guard (*cloog_pointers.p_stmt_guard)
#define stmt_root (*cloog_pointers.p_stmt_root)
#define stmt_user (*cloog_pointers.p_stmt_user)

#define cloog_finalize (*cloog_pointers.p_ppl_finalize)

static bool
init_cloog_pointers (void)
{
  void *h;

  if (cloog_pointers.inited)
    return cloog_pointers.h != NULL;
  h = dlopen ("libcloog.so.0", RTLD_LAZY);
  cloog_pointers.h = h;
  if (h == NULL)
    return false;
#define DYNSYM(x) \
  do \
    { \
      union { __typeof (cloog_pointers.p_##x) p; void *q; } u; \
      u.q = dlsym (h, #x); \
      if (u.q == NULL) \
	return false; \
      cloog_pointers.p_##x = u.p; \
    } \
  while (0)
  DYNSYMS
#undef DYNSYM
  return true;
}

static VEC (scop_p, heap) *current_scops;

/* Converts a GMP constant V to a tree and returns it.  */

   STMT.  */

static tree
gcc_type_for_iv_of_clast_loop (struct clast_for *stmt_fora)
{
  struct clast_user_stmt *stmt = clast_get_body_of_loop ((struct clast_stmt *) stmt_fora);
  const char *cloog_iv = stmt_fora->iterator;
  CloogStatement *cs = stmt->statement;
  graphite_bb_p gbb = (graphite_bb_p) cloog_statement_usr (cs);


  if (number_of_loops () <= 1)
    return;

  if (!init_cloog_pointers ())
    {
      sorry ("Graphite loop optimizations cannot be used");
      return;
    }

  current_scops = VEC_alloc (scop_p, heap, 3);
  recompute_all_dominators ();


Return to bug 317211

Lines 458-464 ac_includes_default="\ Link Here

(-)a/gcc/configure (-1 / +138 lines)
458	# include <unistd.h>	458	# include <unistd.h>
459	#endif"	459	#endif"
460		460
461	ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_LDFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN OBJDUMP ac_ct_OBJDUMP ac_ct_AR STRIP ac_ct_STRIP lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump gcc_cv_readelf libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs fortran_target_objs target_cpu_default GMPLIBS GMPINC PPLLIBS PPLINC CLOOGLIBS CLOOGINC LIBOBJS LTLIBOBJS'	461	ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_LDFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN OBJDUMP ac_ct_OBJDUMP ac_ct_AR STRIP ac_ct_STRIP lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump gcc_cv_readelf libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs fortran_target_objs target_cpu_default GMPLIBS GMPINC PPLLIBS PPLINC CLOOGLIBS CLOOGINC DL_LIB LIBOBJS LTLIBOBJS'
462	ac_subst_files='language_hooks'	462	ac_subst_files='language_hooks'
463	ac_pwd=`pwd`	463	ac_pwd=`pwd`
464		464
Lines 24839-24844 _ACEOF Link Here
24839		24839
24840	fi	24840	fi
24841		24841
		24842	# Check how to dlopen
		24843	DL_LIB=
		24844	saved_LIBS="$LIBS"
		24845	echo "$as_me:$LINENO: checking for library containing dlopen" >&5
		24846	echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6
		24847	if test "${ac_cv_search_dlopen+set}" = set; then
		24848	echo $ECHO_N "(cached) $ECHO_C" >&6
		24849	else
		24850	ac_func_search_save_LIBS=$LIBS
		24851	ac_cv_search_dlopen=no
		24852	cat >conftest.$ac_ext <<_ACEOF
		24853	/* confdefs.h. */
		24854	_ACEOF
		24855	cat confdefs.h >>conftest.$ac_ext
		24856	cat >>conftest.$ac_ext <<_ACEOF
		24857	/* end confdefs.h. */
		24858
		24859	/* Override any gcc2 internal prototype to avoid an error. */
		24860	#ifdef __cplusplus
		24861	extern "C"
		24862	#endif
		24863	/* We use char because int might match the return type of a gcc2
		24864	builtin and then its argument prototype would still apply. */
		24865	char dlopen ();
		24866	int
		24867	main ()
		24868	{
		24869	dlopen ();
		24870	;
		24871	return 0;
		24872	}
		24873	_ACEOF
		24874	rm -f conftest.$ac_objext conftest$ac_exeext
		24875	if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
		24876	(eval $ac_link) 2>conftest.er1
		24877	ac_status=$?
		24878	grep -v '^ *+' conftest.er1 >conftest.err
		24879	rm -f conftest.er1
		24880	cat conftest.err >&5
		24881	echo "$as_me:$LINENO: \$? = $ac_status" >&5
		24882	(exit $ac_status); } &&
		24883	{ ac_try='test -z "$ac_c_werror_flag"
		24884	\|\| test ! -s conftest.err'
		24885	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
		24886	(eval $ac_try) 2>&5
		24887	ac_status=$?
		24888	echo "$as_me:$LINENO: \$? = $ac_status" >&5
		24889	(exit $ac_status); }; } &&
		24890	{ ac_try='test -s conftest$ac_exeext'
		24891	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
		24892	(eval $ac_try) 2>&5
		24893	ac_status=$?
		24894	echo "$as_me:$LINENO: \$? = $ac_status" >&5
		24895	(exit $ac_status); }; }; then
		24896	ac_cv_search_dlopen="none required"
		24897	else
		24898	echo "$as_me: failed program was:" >&5
		24899	sed 's/^/\| /' conftest.$ac_ext >&5
		24900
		24901	fi
		24902	rm -f conftest.err conftest.$ac_objext \
		24903	conftest$ac_exeext conftest.$ac_ext
		24904	if test "$ac_cv_search_dlopen" = no; then
		24905	for ac_lib in dl; do
24906	LIBS="-l$ac_lib $ac_func_search_save_LIBS"
24907	cat >conftest.$ac_ext <<_ACEOF
24908	/* confdefs.h. */
24909	_ACEOF
24910	cat confdefs.h >>conftest.$ac_ext
24911	cat >>conftest.$ac_ext <<_ACEOF
24912	/* end confdefs.h. */
24913
24914	/* Override any gcc2 internal prototype to avoid an error. */
24915	#ifdef __cplusplus
24916	extern "C"
24917	#endif
24918	/* We use char because int might match the return type of a gcc2
24919	builtin and then its argument prototype would still apply. */
24920	char dlopen ();
24921	int
24922	main ()
24923	{
24924	dlopen ();
24925	;
24926	return 0;
24927	}
24928	_ACEOF
24929	rm -f conftest.$ac_objext conftest$ac_exeext
24930	if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
24931	(eval $ac_link) 2>conftest.er1
24932	ac_status=$?
24933	grep -v '^ *+' conftest.er1 >conftest.err
24934	rm -f conftest.er1
24935	cat conftest.err >&5
24936	echo "$as_me:$LINENO: \$? = $ac_status" >&5
24937	(exit $ac_status); } &&
24938	{ ac_try='test -z "$ac_c_werror_flag"
24939	\|\| test ! -s conftest.err'
24940	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
24941	(eval $ac_try) 2>&5
24942	ac_status=$?
24943	echo "$as_me:$LINENO: \$? = $ac_status" >&5
24944	(exit $ac_status); }; } &&
24945	{ ac_try='test -s conftest$ac_exeext'
24946	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
24947	(eval $ac_try) 2>&5
24948	ac_status=$?
24949	echo "$as_me:$LINENO: \$? = $ac_status" >&5
24950	(exit $ac_status); }; }; then
24951	ac_cv_search_dlopen="-l$ac_lib"
24952	break
24953	else
24954	echo "$as_me: failed program was:" >&5
24955	sed 's/^/\| /' conftest.$ac_ext >&5
24956
24957	fi
24958	rm -f conftest.err conftest.$ac_objext \
24959	conftest$ac_exeext conftest.$ac_ext
24960	done
24961	fi
24962	LIBS=$ac_func_search_save_LIBS
24963	fi
24964	echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
24965	echo "${ECHO_T}$ac_cv_search_dlopen" >&6
24966	if test "$ac_cv_search_dlopen" != no; then
24967	test "$ac_cv_search_dlopen" = "none required" \|\| LIBS="$ac_cv_search_dlopen $LIBS"
24968
24969	fi
24970
24971	case $ac_cv_search_dlopen in
24972	no*) ;;
24973	*) DL_LIB=$ac_cv_search_dlopen ;;
24974	esac
24975
24976	LIBS=$saved_LIBS
24977
24842	# Configure the subdirectories	24978	# Configure the subdirectories
24843	# AC_CONFIG_SUBDIRS($subdirs)	24979	# AC_CONFIG_SUBDIRS($subdirs)
24844		24980
Lines 25684-25689 s,@PPLLIBS@,$PPLLIBS,;t t Link Here
25684	s,@PPLINC@,$PPLINC,;t t	25820	s,@PPLINC@,$PPLINC,;t t
25685	s,@CLOOGLIBS@,$CLOOGLIBS,;t t	25821	s,@CLOOGLIBS@,$CLOOGLIBS,;t t
25686	s,@CLOOGINC@,$CLOOGINC,;t t	25822	s,@CLOOGINC@,$CLOOGINC,;t t
		25823	s,@DL_LIB@,$DL_LIB,;t t
25687	s,@LIBOBJS@,$LIBOBJS,;t t	25824	s,@LIBOBJS@,$LIBOBJS,;t t
25688	s,@LTLIBOBJS@,$LTLIBOBJS,;t t	25825	s,@LTLIBOBJS@,$LTLIBOBJS,;t t
25689	/@language_hooks@/r $language_hooks	25826	/@language_hooks@/r $language_hooks

Lines 3990-3995 if test "x${CLOOGLIBS}" != "x" ; then Link Here

(-)a/gcc/configure.ac (+11 lines)
3990	AC_DEFINE(HAVE_cloog, 1, [Define if cloog is in use.])	3990	AC_DEFINE(HAVE_cloog, 1, [Define if cloog is in use.])
3991	fi	3991	fi
3992		3992
		3993	# Check how to dlopen
		3994	DL_LIB=
		3995	saved_LIBS="$LIBS"
		3996	AC_SEARCH_LIBS([dlopen], [dl])
		3997	case $ac_cv_search_dlopen in
		3998	no*) ;;
		3999	*) DL_LIB=$ac_cv_search_dlopen ;;
		4000	esac
		4001	AC_SUBST(DL_LIB)
		4002	LIBS=$saved_LIBS
		4003
3993	# Configure the subdirectories	4004	# Configure the subdirectories
3994	# AC_CONFIG_SUBDIRS($subdirs)	4005	# AC_CONFIG_SUBDIRS($subdirs)
3995		4006

Lines 59-64 along with GCC; see the file COPYING3. If not see Link Here

(-)a/gcc/graphite.c (-3 / +113 lines)
59	#include "cloog/cloog.h"	59	#include "cloog/cloog.h"
60	#include "graphite.h"	60	#include "graphite.h"
61		61
		62	#include <dlfcn.h>
		63	#define DYNSYMS \
		64	DYNSYM (cloog_block_alloc); \
		65	DYNSYM (cloog_block_list_free); \
		66	DYNSYM (cloog_block_list_malloc); \
		67	DYNSYM (cloog_clast_create); \
		68	DYNSYM (cloog_clast_free); \
		69	DYNSYM (cloog_domain_free); \
		70	DYNSYM (cloog_domain_matrix2domain); \
		71	DYNSYM (cloog_initialize); \
		72	DYNSYM (cloog_loop_malloc); \
		73	DYNSYM (cloog_matrix_alloc); \
		74	DYNSYM (cloog_matrix_copy); \
		75	DYNSYM (cloog_matrix_free); \
		76	DYNSYM (cloog_matrix_print); \
		77	DYNSYM (cloog_names_malloc); \
		78	DYNSYM (cloog_names_scalarize); \
		79	DYNSYM (cloog_options_free); \
		80	DYNSYM (cloog_options_malloc); \
		81	DYNSYM (cloog_program_dump_cloog); \
		82	DYNSYM (cloog_program_extract_scalars); \
		83	DYNSYM (cloog_program_free); \
		84	DYNSYM (cloog_program_generate); \
		85	DYNSYM (cloog_program_malloc); \
		86	DYNSYM (cloog_program_print); \
		87	DYNSYM (cloog_program_scatter); \
		88	DYNSYM (cloog_statement_alloc); \
		89	DYNSYM (ppl_finalize); \
		90	DYNSYM (pprint); \
		91	DYNSYM (stmt_block); \
		92	DYNSYM (stmt_for); \
		93	DYNSYM (stmt_guard); \
		94	DYNSYM (stmt_root); \
		95	DYNSYM (stmt_user);
		96	static struct
		97	{
		98	bool inited;
		99	void *h;
		100	#define DYNSYM(x) __typeof (x) *p_##x
		101	DYNSYMS
		102	#undef DYNSYM
		103	} cloog_pointers;
		104
		105	#define cloog_block_alloc (*cloog_pointers.p_cloog_block_alloc)
		106	#define cloog_block_list_free (*cloog_pointers.p_cloog_block_list_free)
		107	#define cloog_block_list_malloc (*cloog_pointers.p_cloog_block_list_malloc)
		108	#define cloog_clast_create (*cloog_pointers.p_cloog_clast_create)
		109	#define cloog_clast_free (*cloog_pointers.p_cloog_clast_free)
		110	#define cloog_domain_free (*cloog_pointers.p_cloog_domain_free)
		111	#define cloog_domain_matrix2domain (*cloog_pointers.p_cloog_domain_matrix2domain)
		112	#define cloog_initialize (*cloog_pointers.p_cloog_initialize)
		113	#define cloog_loop_malloc (*cloog_pointers.p_cloog_loop_malloc)
		114	#define cloog_matrix_alloc (*cloog_pointers.p_cloog_matrix_alloc)
		115	#define cloog_matrix_copy (*cloog_pointers.p_cloog_matrix_copy)
		116	#define cloog_matrix_free (*cloog_pointers.p_cloog_matrix_free)
		117	#define cloog_matrix_print (*cloog_pointers.p_cloog_matrix_print)
		118	#define cloog_names_malloc (*cloog_pointers.p_cloog_names_malloc)
		119	#define cloog_names_scalarize (*cloog_pointers.p_cloog_names_scalarize)
		120	#define cloog_options_free (*cloog_pointers.p_cloog_options_free)
		121	#define cloog_options_malloc (*cloog_pointers.p_cloog_options_malloc)
		122	#define cloog_program_dump_cloog (*cloog_pointers.p_cloog_program_dump_cloog)
		123	#define cloog_program_extract_scalars (*cloog_pointers.p_cloog_program_extract_scalars)
		124	#define cloog_program_free (*cloog_pointers.p_cloog_program_free)
		125	#define cloog_program_generate (*cloog_pointers.p_cloog_program_generate)
126	#define cloog_program_malloc (*cloog_pointers.p_cloog_program_malloc)
127	#define cloog_program_print (*cloog_pointers.p_cloog_program_print)
128	#define cloog_program_scatter (*cloog_pointers.p_cloog_program_scatter)
129	#define cloog_statement_alloc (*cloog_pointers.p_cloog_statement_alloc)
130	#define ppl_finalize (*cloog_pointers.p_ppl_finalize)
131	#define pprint (*cloog_pointers.p_pprint)
132	#define stmt_block (*cloog_pointers.p_stmt_block)
133	#define stmt_for (*cloog_pointers.p_stmt_for)
134	#define stmt_guard (*cloog_pointers.p_stmt_guard)
135	#define stmt_root (*cloog_pointers.p_stmt_root)
136	#define stmt_user (*cloog_pointers.p_stmt_user)
137
138	#define cloog_finalize (*cloog_pointers.p_ppl_finalize)
139
140	static bool
141	init_cloog_pointers (void)
142	{
143	void *h;
144
145	if (cloog_pointers.inited)
146	return cloog_pointers.h != NULL;
147	h = dlopen ("libcloog.so.0", RTLD_LAZY);
148	cloog_pointers.h = h;
149	if (h == NULL)
150	return false;
151	#define DYNSYM(x) \
152	do \
153	{ \
154	union { __typeof (cloog_pointers.p_##x) p; void *q; } u; \
155	u.q = dlsym (h, #x); \
156	if (u.q == NULL) \
157	return false; \
158	cloog_pointers.p_##x = u.p; \
159	} \
160	while (0)
161	DYNSYMS
162	#undef DYNSYM
163	return true;
164	}
165
62	static VEC (scop_p, heap) *current_scops;	166	static VEC (scop_p, heap) *current_scops;
63		167
64	/* Converts a GMP constant V to a tree and returns it. */	168	/* Converts a GMP constant V to a tree and returns it. */
Lines 4075-4084 clast_get_body_of_loop (struct clast_stmt *stmt) Link Here
4075	STMT. */	4179	STMT. */
4076		4180
4077	static tree	4181	static tree
4078	gcc_type_for_iv_of_clast_loop (struct clast_for *stmt_for)	4182	gcc_type_for_iv_of_clast_loop (struct clast_for *stmt_fora)
4079	{	4183	{
4080	struct clast_user_stmt stmt = clast_get_body_of_loop ((struct clast_stmt ) stmt_for);	4184	struct clast_user_stmt stmt = clast_get_body_of_loop ((struct clast_stmt ) stmt_fora);
4081	const char *cloog_iv = stmt_for->iterator;	4185	const char *cloog_iv = stmt_fora->iterator;
4082	CloogStatement *cs = stmt->statement;	4186	CloogStatement *cs = stmt->statement;
4083	graphite_bb_p gbb = (graphite_bb_p) cloog_statement_usr (cs);	4187	graphite_bb_p gbb = (graphite_bb_p) cloog_statement_usr (cs);
4084		4188
Lines 6109-6114 graphite_transform_loops (void) Link Here
6109	if (number_of_loops () <= 1)	6213	if (number_of_loops () <= 1)
6110	return;	6214	return;
6111		6215
		6216	if (!init_cloog_pointers ())
		6217	{
		6218	sorry ("Graphite loop optimizations cannot be used");
		6219	return;
		6220	}
		6221
6112	current_scops = VEC_alloc (scop_p, heap, 3);	6222	current_scops = VEC_alloc (scop_p, heap, 3);
6113	recompute_all_dominators ();	6223	recompute_all_dominators ();
6114		6224