Patchwork [4.5] Allow ppl 0.11

login
register
mail settings
Submitter Richard Guenther
Date Jan. 25, 2011, 3:29 p.m.
Message ID <alpine.LNX.2.00.1101251625590.17230@zhemvz.fhfr.qr>
Download mbox | patch
Permalink /patch/80378/
State New
Headers show

Comments

Richard Guenther - Jan. 25, 2011, 3:29 p.m.
Sebastian, the 4.5 branch fails to enable graphite with PPL 0.11.
The following backports the change from trunk that allowed it.  Are
there any issues with that (it seems to build fine for me).

I'll check if the branch also works with cloog 0.16.1 later ...

Thanks,
Richard.

2011-01-25  Richard Guenther  <rguenther@suse.de>

	Backport from mainline
	2010-05-05  Sebastian Pop  <sebastian.pop@amd.com>

	* configure.ac: Allow all the versions greater than 0.10 of PPL.
	* configure: Regenerated.
Sebastian Pop - Jan. 25, 2011, 3:36 p.m.
On Tue, Jan 25, 2011 at 09:29, Richard Guenther <rguenther@suse.de> wrote:
>
> Sebastian, the 4.5 branch fails to enable graphite with PPL 0.11.
> The following backports the change from trunk that allowed it.  Are
> there any issues with that (it seems to build fine for me).

Allowing PPL 0.10, 0.11, or later is fine for gcc 4.5.

>
> I'll check if the branch also works with cloog 0.16.1 later ...
>

as I said, you will need more changes to be backported for this to work.

Thanks,
Sebastian

Patch

Index: configure
===================================================================
--- configure	(revision 159133)
+++ configure	(revision 159134)
@@ -5801,8 +5801,6 @@  fi
 
 
 # Check for PPL
-ppl_major_version=0
-ppl_minor_version=10
 ppllibs=" -lppl_c -lppl -lgmpxx"
 pplinc=
 
@@ -5859,8 +5857,8 @@  fi
 if test "x$with_ppl" != "xno" -a "${ENABLE_PPL_CHECK}" = "yes"; then
   saved_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $pplinc $gmpinc"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version $ppl_major_version.$ppl_minor_version of PPL" >&5
-$as_echo_n "checking for version $ppl_major_version.$ppl_minor_version of PPL... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.10 (or later revision) of PPL" >&5
+$as_echo_n "checking for version 0.10 (or later revision) of PPL... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "ppl_c.h"
@@ -5868,7 +5866,7 @@  int
 main ()
 {
 
-  #if PPL_VERSION_MAJOR != $ppl_major_version || PPL_VERSION_MINOR != $ppl_minor_version
+  #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10
   choke me
   #endif
 
Index: configure.ac
===================================================================
--- configure.ac	(revision 159133)
+++ configure.ac	(revision 159134)
@@ -1531,8 +1531,6 @@  AC_ARG_WITH(boot-ldflags,
 AC_SUBST(poststage1_ldflags)
 
 # Check for PPL
-ppl_major_version=0
-ppl_minor_version=10
 ppllibs=" -lppl_c -lppl -lgmpxx"
 pplinc=
 
@@ -1573,9 +1571,9 @@  ENABLE_PPL_CHECK=yes)
 if test "x$with_ppl" != "xno" -a "${ENABLE_PPL_CHECK}" = "yes"; then
   saved_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $pplinc $gmpinc"
-  AC_MSG_CHECKING([for version $ppl_major_version.$ppl_minor_version of PPL])
+  AC_MSG_CHECKING([for version 0.10 (or later revision) of PPL])
   AC_TRY_COMPILE([#include "ppl_c.h"],[
-  #if PPL_VERSION_MAJOR != $ppl_major_version || PPL_VERSION_MINOR != $ppl_minor_version
+  #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10
   choke me
   #endif
   ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ; with_ppl=no ])