Re: [PATCH] Add -lpwl to ppllibs.

Sebastian Pop
2011-03-02T03:53:17Z

[-- Attachment #1: Type: text/plain, Size: 1405 bytes --]

Hi,

On Sun, Feb 27, 2011 at 03:38, Ralf Wildenhues <ralf.wildenhues@gmx.de> wrote:
> * Sebastian Pop wrote on Sun, Feb 27, 2011 at 08:23:15AM CET:
>> On Sun, Feb 27, 2011 at 00:35, Ralf Wildenhues wrote:
>> > * Sebastian Pop wrote on Wed, Feb 23, 2011 at 09:47:07PM CET:
>> >> here is the updated patch with your remarks and the remarks from
>> >> Rainer.  We still have the libs in the same order: -lppl_c -lppl
>> >> $pwllib, and I will change the order following what Roberto says.
>> >
>> > Well, has Roberto replied yet?  The contents of the patch depend
>> > on the answer, and I'd rather review that version of the patch
>> > that is supposed to go in.
>> >
>> > The patch looks OK for the case that pwl doesn't depend on any
>> > of the other PPL libs.
>>
>> I have not yet received an answer for the question of whether PWL is
>> independent of PPL.
>
> He answered now.  So the patch is OK.
>
>> > Please remember that toplevel patches need to be synced to src.
>>
>> Am I supposed to commit the configure changes to a different place
>> than gcc trunk?
>
> Yes, to the src CVS repository, and Cc:ing binutils and gdb-patches
> at sourceware.org.  See
> http://gcc.gnu.org/codingconventions.html#upstream for details.

Here are the two patches that I committed to
svn+ssh://spop@gcc.gnu.org/svn/gcc
and synced to :ext:spop@sourceware.org:/cvs/src

Sebastian

[-- Attachment #2: 0001-Add-lisl-to-clooglibs.patch --]
[-- Type: text/x-patch, Size: 1563 bytes --]

From 5c317faa934ddf93f9f2b68b8ddb857db4be9a0c Mon Sep 17 00:00:00 2001
From: Sebastian Pop <sebpop@gmail.com>
Date: Fri, 18 Feb 2011 11:25:52 -0600
Subject: [PATCH 1/2] Add -lisl to clooglibs.

2011-03-02 Sebastian Pop <sebastian.pop@amd.com>

* config/cloog.m4: Add -lisl to clooglibs.
* configure: Regenerated.
---
ChangeLog | 5 +++++
config/cloog.m4 | 2 +-
configure | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8005328..7f1df97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-02 Sebastian Pop <sebastian.pop@amd.com>
+
+ * config/cloog.m4: Add -lisl to clooglibs.
+ * configure: Regenerated.
+
2011-02-24 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>

* MAINTAINERS (CPU Port maintainers): Add self.
diff --git a/config/cloog.m4 b/config/cloog.m4
index ec8b46d..e95b98d 100644
--- a/config/cloog.m4
+++ b/config/cloog.m4
@@ -179,7 +179,7 @@ AC_DEFUN([CLOOG_FIND_FLAGS],
;;
"ISL")
clooginc="${clooginc} ${_cloogorginc}"
- clooglibs="${clooglibs} -lcloog-isl"
+ clooglibs="${clooglibs} -lcloog-isl -lisl"
cloog_org=yes
;;
"PPL")
diff --git a/configure b/configure
index 501c6ff..ac7db39 100755
--- a/configure
+++ b/configure
@@ -5963,7 +5963,7 @@ $as_echo "$gcc_cv_cloog_type" >&6; }
;;
"ISL")
clooginc="${clooginc} ${_cloogorginc}"
- clooglibs="${clooglibs} -lcloog-isl"
+ clooglibs="${clooglibs} -lcloog-isl -lisl"
cloog_org=yes
;;
"PPL")
--
1.7.1

[-- Attachment #3: 0002-Add-lpwl-to-ppllibs.patch --]
[-- Type: text/x-patch, Size: 8872 bytes --]

From 9c87128c7e9fd9b67bd99d37b82a7fd55df5c91b Mon Sep 17 00:00:00 2001
From: Sebastian Pop <sebpop@gmail.com>
Date: Fri, 18 Feb 2011 11:24:33 -0600
Subject: [PATCH 2/2] Add -lpwl to ppllibs.

2011-03-02 Sebastian Pop <sebastian.pop@amd.com>

* configure.ac: Add -lpwl to ppllibs.
* configure: Regenerated.
---
ChangeLog | 5 +++
configure | 108 +++++++++++++++++++++++++++++++++++++++++++++-------------
configure.ac | 73 +++++++++++++++++++++++++--------------
3 files changed, 136 insertions(+), 50 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7f1df97..2921567 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2011-03-02 Sebastian Pop <sebastian.pop@amd.com>

+ * configure.ac: Add -lpwl to ppllibs.
+ * configure: Regenerated.
+
+2011-03-02 Sebastian Pop <sebastian.pop@amd.com>
+
* config/cloog.m4: Add -lisl to clooglibs.
* configure: Regenerated.

diff --git a/configure b/configure
index ac7db39..997282f 100755
--- a/configure
+++ b/configure
@@ -5660,8 +5660,9 @@ fi

# Check for PPL
-ppllibs=" -lppl_c -lppl -lgmpxx"
+ppllibs=
pplinc=
+pwllib=

# Check whether --with-ppl was given.
@@ -5682,52 +5683,110 @@ if test "${with_ppl_lib+set}" = set; then :
fi

+# Check whether --enable-ppl-version-check was given.
+if test "${enable_ppl_version_check+set}" = set; then :
+ enableval=$enable_ppl_version_check;
+fi
+
+
case $with_ppl in
- no)
- ppllibs=
- ;;
- "" | yes)
+ yes | no | "")
;;
*)
- ppllibs="-L$with_ppl/lib -lppl_c -lppl -lgmpxx"
+ ppllibs="-L$with_ppl/lib"
pplinc="-I$with_ppl/include $pplinc"
+ if test -d "$with_ppl/lib" && test -d "$with_ppl/include"; then
+ with_ppl=yes
+ else
+ as_fn_error "cannot find directories \"$with_ppl/lib\" or \"$with_ppl/include\"" "$LINENO" 5
+ fi
;;
esac
-if test "x$with_ppl_include" != x; then
+
+if test x"$with_ppl_include" != x; then
pplinc="-I$with_ppl_include $pplinc"
+ with_ppl=yes
fi
+
if test "x$with_ppl_lib" != x; then
- ppllibs="-L$with_ppl_lib -lppl_c -lppl -lgmpxx"
+ ppllibs="-L$with_ppl_lib"
+ with_ppl=yes
fi
-if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
- ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/interfaces/C/'"$lt_cv_objdir"' -L$$r/$(HOST_SUBDIR)/ppl/src/'"$lt_cv_objdir"' -lppl_c -lppl -lgmpxx '
+
+if test x"$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
+ if test x"$enable_watchdog" = xyes; then
+ pwllib="-lpwl"
+ fi
+ ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/interfaces/C/'"$lt_cv_objdir"' -L$$r/$(HOST_SUBDIR)/ppl/src/'"$lt_cv_objdir"
pplinc='-I$$r/$(HOST_SUBDIR)/ppl/src -I$$r/$(HOST_SUBDIR)/ppl/interfaces/C '
enable_ppl_version_check=no
+ with_ppl=yes
fi

-# Check whether --enable-ppl-version-check was given.
-if test "${enable_ppl_version_check+set}" = set; then :
- enableval=$enable_ppl_version_check; ENABLE_PPL_CHECK=$enableval
+if test "x$with_ppl" = xyes; then
+ if test "x$pwllib" = x; then
+ saved_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $ppllibs"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PWL_handle_timeout in -lpwl" >&5
+$as_echo_n "checking for PWL_handle_timeout in -lpwl... " >&6; }
+if test "${ac_cv_lib_pwl_PWL_handle_timeout+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpwl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char PWL_handle_timeout ();
+int
+main ()
+{
+return PWL_handle_timeout ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_pwl_PWL_handle_timeout=yes
else
- ENABLE_PPL_CHECK=yes
+ ac_cv_lib_pwl_PWL_handle_timeout=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pwl_PWL_handle_timeout" >&5
+$as_echo "$ac_cv_lib_pwl_PWL_handle_timeout" >&6; }
+if test "x$ac_cv_lib_pwl_PWL_handle_timeout" = x""yes; then :
+ pwllib="-lpwl"
fi

+ LDFLAGS="$saved_LDFLAGS"
+ 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 0.11 (or later revision) of PPL" >&5
-$as_echo_n "checking for version 0.11 (or later revision) of PPL... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ ppllibs="$ppllibs -lppl_c -lppl $pwllib -lgmpxx"
+
+ if test "$enable_ppl_version_check" != no; then
+ saved_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $pplinc $gmpinc"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.11 (revision 0 or later) of PPL" >&5
+$as_echo_n "checking for version 0.11 (revision 0 or later) of PPL... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include "ppl_c.h"
int
main ()
{

- #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11
- choke me
- #endif
+ #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11
+ choke me
+ #endif

;
return 0;
@@ -5741,7 +5800,8 @@ else
$as_echo "no" >&6; }; ppllibs= ; pplinc= ; with_ppl=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS="$saved_CFLAGS"
+ CFLAGS="$saved_CFLAGS"
+ fi
fi

# Flags needed for PPL
diff --git a/configure.ac b/configure.ac
index 9121d65..4fb29c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1621,8 +1621,9 @@ AC_ARG_WITH(boot-ldflags,
AC_SUBST(poststage1_ldflags)

# Check for PPL
-ppllibs=" -lppl_c -lppl -lgmpxx"
+ppllibs=
pplinc=
+pwllib=

AC_ARG_WITH(ppl,
[AS_HELP_STRING([--with-ppl=PATH],
@@ -1636,45 +1637,65 @@ AC_ARG_WITH(ppl-lib,
[AS_HELP_STRING([--with-ppl-lib=PATH],
[specify directory for the installed PPL library])])

-case $with_ppl in
- no)
- ppllibs=
- ;;
- "" | yes)
+AC_ARG_ENABLE(ppl-version-check,
+[AS_HELP_STRING([--disable-ppl-version-check],
+ [disable check for PPL version])])
+
+case $with_ppl in
+ yes | no | "")
;;
*)
- ppllibs="-L$with_ppl/lib -lppl_c -lppl -lgmpxx"
+ ppllibs="-L$with_ppl/lib"
pplinc="-I$with_ppl/include $pplinc"
+ if test -d "$with_ppl/lib" && test -d "$with_ppl/include"; then
+ with_ppl=yes
+ else
+ AC_MSG_ERROR([cannot find directories "$with_ppl/lib" or "$with_ppl/include"])
+ fi
;;
esac
-if test "x$with_ppl_include" != x; then
+
+if test x"$with_ppl_include" != x; then
pplinc="-I$with_ppl_include $pplinc"
+ with_ppl=yes
fi
+
if test "x$with_ppl_lib" != x; then
- ppllibs="-L$with_ppl_lib -lppl_c -lppl -lgmpxx"
+ ppllibs="-L$with_ppl_lib"
+ with_ppl=yes
fi
-if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
- ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/interfaces/C/'"$lt_cv_objdir"' -L$$r/$(HOST_SUBDIR)/ppl/src/'"$lt_cv_objdir"' -lppl_c -lppl -lgmpxx '
+
+if test x"$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
+ if test x"$enable_watchdog" = xyes; then
+ pwllib="-lpwl"
+ fi
+ ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/interfaces/C/'"$lt_cv_objdir"' -L$$r/$(HOST_SUBDIR)/ppl/src/'"$lt_cv_objdir"
pplinc='-I$$r/$(HOST_SUBDIR)/ppl/src -I$$r/$(HOST_SUBDIR)/ppl/interfaces/C '
enable_ppl_version_check=no
+ with_ppl=yes
fi

-AC_ARG_ENABLE(ppl-version-check,
-[AS_HELP_STRING([--disable-ppl-version-check],
- [disable check for PPL version])],
-ENABLE_PPL_CHECK=$enableval,
-ENABLE_PPL_CHECK=yes)
+if test "x$with_ppl" = xyes; then
+ if test "x$pwllib" = x; then
+ saved_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $ppllibs"
+ AC_CHECK_LIB(pwl,PWL_handle_timeout,[pwllib="-lpwl"])
+ LDFLAGS="$saved_LDFLAGS"
+ fi

-if test "x$with_ppl" != "xno" -a "${ENABLE_PPL_CHECK}" = "yes"; then
- saved_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $pplinc $gmpinc"
- AC_MSG_CHECKING([for version 0.11 (or later revision) of PPL])
- AC_TRY_COMPILE([#include "ppl_c.h"],[
- #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11
- choke me
- #endif
- ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ; with_ppl=no ])
- CFLAGS="$saved_CFLAGS"
+ ppllibs="$ppllibs -lppl_c -lppl $pwllib -lgmpxx"
+
+ if test "$enable_ppl_version_check" != no; then
+ saved_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $pplinc $gmpinc"
+ AC_MSG_CHECKING([for version 0.11 (revision 0 or later) of PPL])
+ AC_TRY_COMPILE([#include "ppl_c.h"],[
+ #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11
+ choke me
+ #endif
+ ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ; with_ppl=no ])
+ CFLAGS="$saved_CFLAGS"
+ fi
fi

# Flags needed for PPL
--
1.7.1