Skip to content

Commit 0a7746b

Browse files
jbglawjbglaw
committed
* configure.ac: Sync with GCC repo.
 * configure: Ditto. * Makefile.def: Ditto. * Makefile.in: Ditto.
1 parent 7d88a8d commit 0a7746b

File tree

5 files changed

+118
-16
lines changed

5 files changed

+118
-16
lines changed

‎ChangeLog

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2013-01-15 Jan-Benedict Glaw <[email protected]>
2+
3+
* configure.ac: Sync with GCC repo.
4+
* configure: Ditto.
5+
* Makefile.def: Ditto.
6+
* Makefile.in: Ditto.
7+
18
2013-01-11 Joel Brobecker <[email protected]>
29

310
Sync with GCC, merge:

‎Makefile.def

+1
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,7 @@ dependencies = { module=all-target-libstdc++-v3; on=configure-target-libgomp; };
524524
dependencies = { module=install-target-libgo; on=install-target-libatomic; };
525525
dependencies = { module=install-target-libgfortran; on=install-target-libquadmath; };
526526
dependencies = { module=install-target-libgfortran; on=install-target-libgcc; };
527+
dependencies = { module=install-target-libsanitizer; on=install-target-libstdc++-v3; };
527528
dependencies = { module=install-target-libsanitizer; on=install-target-libgcc; };
528529
dependencies = { module=install-target-libjava; on=install-target-libgcc; };
529530
dependencies = { module=install-target-libitm; on=install-target-libgcc; };

‎Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -46216,6 +46216,7 @@ all-stagefeedback-target-libstdc++-v3: maybe-configure-stagefeedback-target-libg
4621646216
install-target-libgo: maybe-install-target-libatomic
4621746217
install-target-libgfortran: maybe-install-target-libquadmath
4621846218
install-target-libgfortran: maybe-install-target-libgcc
46219+
install-target-libsanitizer: maybe-install-target-libstdc++-v3
4621946220
install-target-libsanitizer: maybe-install-target-libgcc
4622046221
install-target-libjava: maybe-install-target-libgcc
4622146222
install-target-libitm: maybe-install-target-libgcc

‎configure

+101-11
Original file line numberDiff line numberDiff line change
@@ -5819,6 +5819,8 @@ fi
58195819
isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' '
58205820
islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include'
58215821
ENABLE_ISL_CHECK=no
5822+
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using in-tree ISL, disabling version check" >&5
5823+
$as_echo "$as_me: WARNING: using in-tree ISL, disabling version check" >&2;}
58225824
fi
58235825

58245826

@@ -5835,10 +5837,7 @@ fi
58355837

58365838
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.10 of ISL" >&5
58375839
$as_echo_n "checking for version 0.10 of ISL... " >&6; }
5838-
if test "${gcc_cv_isl+set}" = set; then :
5839-
$as_echo_n "(cached) " >&6
5840-
else
5841-
if test "$cross_compiling" = yes; then :
5840+
if test "$cross_compiling" = yes; then :
58425841
gcc_cv_isl=yes
58435842
else
58445843
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5864,8 +5863,56 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
58645863
conftest.$ac_objext conftest.beam conftest.$ac_ext
58655864
fi
58665865

5866+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
5867+
$as_echo "$gcc_cv_isl" >&6; }
5868+
5869+
CFLAGS=$_isl_saved_CFLAGS
5870+
LDFLAGS=$_isl_saved_LDFLAGS
5871+
LIBS=$_isl_saved_LIBS
5872+
fi
5873+
5874+
5875+
if test "${gcc_cv_isl}" = no ; then
5876+
5877+
if test "${ENABLE_ISL_CHECK}" = yes ; then
5878+
_isl_saved_CFLAGS=$CFLAGS
5879+
_isl_saved_LDFLAGS=$LDFLAGS
5880+
_isl_saved_LIBS=$LIBS
5881+
5882+
CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
5883+
LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
5884+
LIBS="${_isl_saved_LIBS} -lisl"
5885+
echo $CFLAGS
5886+
5887+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.11 of ISL" >&5
5888+
$as_echo_n "checking for version 0.11 of ISL... " >&6; }
5889+
if test "$cross_compiling" = yes; then :
5890+
gcc_cv_isl=yes
5891+
else
5892+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5893+
/* end confdefs.h. */
5894+
#include <isl/version.h>
5895+
#include <string.h>
5896+
int
5897+
main ()
5898+
{
5899+
if (strncmp (isl_version (), "isl-0.11", strlen ("isl-0.11")) != 0)
5900+
return 1;
5901+
5902+
;
5903+
return 0;
5904+
}
5905+
_ACEOF
5906+
if ac_fn_c_try_run "$LINENO"; then :
5907+
gcc_cv_isl=yes
5908+
else
5909+
gcc_cv_isl=no
5910+
fi
5911+
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
5912+
conftest.$ac_objext conftest.beam conftest.$ac_ext
58675913
fi
5868-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
5914+
5915+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
58695916
$as_echo "$gcc_cv_isl" >&6; }
58705917

58715918
CFLAGS=$_isl_saved_CFLAGS
@@ -5874,6 +5921,7 @@ $as_echo "$gcc_cv_isl" >&6; }
58745921
fi
58755922

58765923

5924+
fi
58775925

58785926

58795927

@@ -5947,10 +5995,13 @@ fi
59475995
if test "x${with_cloog_lib}" != x; then
59485996
clooglibs="-L$with_cloog_lib"
59495997
fi
5950-
if test "x${clooginc}" = x && test "x${clooglibs}" = x \
5998+
if test "x${clooginc}" = x && test "x${clooglibs}" = x \
59515999
&& test -d ${srcdir}/cloog; then
59526000
clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' '
59536001
clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -I'${srcdir}'/cloog/include '
6002+
ENABLE_CLOOG_CHECK=no
6003+
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using in-tree CLooG, disabling version check" >&5
6004+
$as_echo "$as_me: WARNING: using in-tree CLooG, disabling version check" >&2;}
59546005
fi
59556006

59566007
clooginc="-DCLOOG_INT_GMP ${clooginc}"
@@ -5969,10 +6020,7 @@ fi
59696020

59706021
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17.0 of CLooG" >&5
59716022
$as_echo_n "checking for version 0.17.0 of CLooG... " >&6; }
5972-
if test "${gcc_cv_cloog+set}" = set; then :
5973-
$as_echo_n "(cached) " >&6
5974-
else
5975-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6023+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
59766024
/* end confdefs.h. */
59776025
#include "cloog/version.h"
59786026
int
@@ -5993,15 +6041,57 @@ else
59936041
gcc_cv_cloog=no
59946042
fi
59956043
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6044+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog" >&5
6045+
$as_echo "$gcc_cv_cloog" >&6; }
6046+
6047+
CFLAGS=$_cloog_saved_CFLAGS
6048+
LDFLAGS=$_cloog_saved_LDFLAGS
6049+
fi
6050+
6051+
6052+
if test "${gcc_cv_cloog}" = no ; then
6053+
6054+
6055+
6056+
if test "${ENABLE_CLOOG_CHECK}" = yes ; then
6057+
_cloog_saved_CFLAGS=$CFLAGS
6058+
_cloog_saved_LDFLAGS=$LDFLAGS
6059+
6060+
CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${islinc} ${gmpinc}"
6061+
LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${isllibs} ${gmplib}"
6062+
6063+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.18.0 of CLooG" >&5
6064+
$as_echo_n "checking for version 0.18.0 of CLooG... " >&6; }
6065+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6066+
/* end confdefs.h. */
6067+
#include "cloog/version.h"
6068+
int
6069+
main ()
6070+
{
6071+
#if CLOOG_VERSION_MAJOR != 0 \
6072+
|| CLOOG_VERSION_MINOR != 18 \
6073+
|| CLOOG_VERSION_REVISION < 0
6074+
choke me
6075+
#endif
6076+
;
6077+
return 0;
6078+
}
6079+
_ACEOF
6080+
if ac_fn_c_try_compile "$LINENO"; then :
6081+
gcc_cv_cloog=yes
6082+
else
6083+
gcc_cv_cloog=no
59966084
fi
5997-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog" >&5
6085+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6086+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog" >&5
59986087
$as_echo "$gcc_cv_cloog" >&6; }
59996088

60006089
CFLAGS=$_cloog_saved_CFLAGS
60016090
LDFLAGS=$_cloog_saved_LDFLAGS
60026091
fi
60036092

60046093

6094+
fi
60056095

60066096

60076097

‎configure.ac

+8-5
Original file line numberDiff line numberDiff line change
@@ -1606,8 +1606,11 @@ if test "x$with_isl" != "xno" &&
16061606
dnl Provide configure switches and initialize islinc & isllibs
16071607
dnl with user input.
16081608
ISL_INIT_FLAGS
1609-
dnl The minimal version of ISL required for Graphite.
1609+
dnl The versions of ISL that work for Graphite
16101610
ISL_CHECK_VERSION(0,10)
1611+
if test "${gcc_cv_isl}" = no ; then
1612+
ISL_CHECK_VERSION(0,11)
1613+
fi
16111614
dnl Only execute fail-action, if ISL has been requested.
16121615
ISL_IF_FAILED([
16131616
AC_MSG_ERROR([Unable to find a usable ISL. See config.log for details.])])
@@ -1617,11 +1620,11 @@ if test "x$with_isl" != "xno" &&
16171620
dnl Provide configure switches and initialize clooginc & clooglibs
16181621
dnl with user input.
16191622
CLOOG_INIT_FLAGS
1620-
dnl The minimal version of CLooG required for Graphite.
1621-
dnl
1622-
dnl If we use CLooG-Legacy, the provided version information is
1623-
dnl ignored.
1623+
dnl The versions of CLooG that work for Graphite.
16241624
CLOOG_CHECK_VERSION(0,17,0)
1625+
if test "${gcc_cv_cloog}" = no ; then
1626+
CLOOG_CHECK_VERSION(0,18,0)
1627+
fi
16251628

16261629
dnl Only execute fail-action, if CLooG has been requested.
16271630
CLOOG_IF_FAILED([

0 commit comments

Comments
 (0)