This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: Resync toplevel files (was: Re: [RFA] Build gdb on darwin)
On Thu, 27 Nov 2008, Joseph S. Myers wrote:
> On Thu, 27 Nov 2008, Tristan Gingold wrote:
>
> >
> > On Nov 27, 2008, at 4:00 PM, Stan Shebs wrote:
> >
> > > Tristan Gingold wrote:
> > > > Hi,
> > > >
> > > > all the bits for darwin/x86 have been committed but the top-level
> > > > configure doesn't build gdb.
> > > > This patch build gdb when configured for i*86-*-darwin.
> > >
> > > This is good, thanks!
> >
> > Committed. Thanks.
>
> Remember that toplevel patches need to go in both the gcc and src
> repositories. As there seem to be quite a lot that haven't, I've applied
> this patch to GCC and will follow up with resyncing changes in the other
> direction.
And here is what I have committed to src to resync for eight commits that
went to GCC only and one where the src version had two lines missing from
a comment.
Index: ChangeLog
===================================================================
RCS file: /cvs/src/src/ChangeLog,v
retrieving revision 1.829
diff -u -r1.829 ChangeLog
--- ChangeLog 27 Nov 2008 15:20:39 -0000 1.829
+++ ChangeLog 27 Nov 2008 17:13:29 -0000
@@ -1,3 +1,72 @@
+2008-11-27 Joseph Myers <joseph@codesourcery.com>
+
+ Merge from GCC:
+
+ 2007-12-02 Matthias Klose <doko@ubuntu.com>
+
+ * config-ml.in: Remove 64bit configure tests.
+
+ 2008-05-14 Rafael Espindola <espindola@google.com>
+
+ * config-ml.in: don't handle --enable-shared and --enable-static.
+
+ 2008-09-02 Sebastian Pop <sebastian.pop@amd.com>
+ Tobias Grosser <grosser@fim.uni-passau.de>
+ Jan Sjodin <jan.sjodin@amd.com>
+ Harsha Jagasia <harsha.jagasia@amd.com>
+ Dwarakanath Rajagopal <dwarak.rajagopal@amd.com>
+ Konrad Trifunovic <konrad.trifunovic@inria.fr>
+ Adrien Eliche <aeliche@isty.uvsq.fr>
+
+ Merge from graphite branch.
+ * configure: Regenerate.
+ * Makefile.in: Regenerate.
+ * configure.ac (host_libs): Add ppl and cloog.
+ Add checks for PPL and CLooG.
+ * Makefile.def (ppl, cloog): Added modules and dependences.
+ * Makefile.tpl (PPLLIBS, PPLINC, CLOOGLIBS, CLOOGINC): New.
+ (HOST_PPLLIBS, HOST_PPLINC, HOST_CLOOGLIBS, HOST_CLOOGINC): New.
+
+ 2008-09-03 Richard Guenther <rguenther@suse.de>
+
+ * configure.ac: Always pass -DCLOOG_PPL_BACKEND to the
+ cloog test.
+ * configure: Re-generate.
+
+ 2008-09-03 Sebastian Pop <sebastian.pop@amd.com>
+
+ * configure.ac (--with-cloog-polylib): New.
+ (--disable-cloog-version-check): New.
+ (--disable-ppl-version-check): New.
+ * configure: Re-generate.
+
+ 2008-09-05 Richard Guenther <rguenther@suse.de>
+
+ * configure.ac: Initialize clooglibs to -lcloog.
+ * configure: Re-generate.
+
+ 2008-10-13 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
+
+ * configure.ac (MPFR check): Bump minimum version to 2.3.0 and
+ recommended version to 2.3.2.
+
+ * configure: Regenerate.
+
+ 2008-10-31 Ben Elliston <bje@au.ibm.com>
+
+ * configure.ac (spu-*-*): Remove special case.
+ * configure: Regenerate.
+
+ Complete comment text from GCC version of:
+
+ 2008-08-31 Aaron W. LaFramboise <aaronavay62@aaronwl.com>
+
+ * configure.ac (RPATH_ENVVAR): Use PATH on Windows.
+ (GCC_SHLIB_SUBDIR): New.
+ * Makefile.tpl (HOST_LIB_PATH_gcc): Use GCC_SHLIB_SUBDIR.
+ * configure: Regenerate.
+ * Makefile.in: Regenerate.
+
2008-11-27 Tristan Gingold <gingold@adacore.com>
* configure.ac: Build gdb for i?86-*-darwin*
Index: Makefile.def
===================================================================
RCS file: /cvs/src/src/Makefile.def,v
retrieving revision 1.94
diff -u -r1.94 Makefile.def
--- Makefile.def 14 Nov 2008 15:10:49 -0000 1.94
+++ Makefile.def 27 Nov 2008 17:13:29 -0000
@@ -68,6 +68,16 @@
no_install= true;
host="none-${host_vendor}-${host_os}";
target="none-${host_vendor}-${host_os}"; };
+host_modules= { module= ppl; lib_path=.libs; bootstrap=true;
+ extra_configure_flags='--disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/';
+ no_install= true;
+ host="none-${host_vendor}-${host_os}";
+ target="none-${host_vendor}-${host_os}"; };
+host_modules= { module= cloog; lib_path=.libs; bootstrap=true;
+ extra_configure_flags='--disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp';
+ no_install= true;
+ host="none-${host_vendor}-${host_os}";
+ target="none-${host_vendor}-${host_os}"; };
host_modules= { module= gnuserv; };
host_modules= { module= gold; bootstrap=true; };
host_modules= { module= gprof; };
@@ -295,6 +305,8 @@
dependencies = { module=all-gcc; on=all-gmp; };
dependencies = { module=all-gcc; on=all-intl; };
dependencies = { module=all-gcc; on=all-mpfr; };
+dependencies = { module=all-gcc; on=all-ppl; };
+dependencies = { module=all-gcc; on=all-cloog; };
dependencies = { module=all-gcc; on=all-build-texinfo; };
dependencies = { module=all-gcc; on=all-build-bison; };
dependencies = { module=all-gcc; on=all-build-byacc; };
@@ -318,6 +330,9 @@
dependencies = { module=all-gnattools; on=all-target-libada; };
dependencies = { module=configure-mpfr; on=all-gmp; };
+dependencies = { module=configure-ppl; on=all-gmp; };
+dependencies = { module=configure-ppl; on=all-mpfr; };
+dependencies = { module=configure-cloog; on=all-ppl; };
// Host modules specific to gdb.
dependencies = { module=configure-gdb; on=all-intl; };
Index: Makefile.tpl
===================================================================
RCS file: /cvs/src/src/Makefile.tpl,v
retrieving revision 1.197
diff -u -r1.197 Makefile.tpl
--- Makefile.tpl 14 Nov 2008 15:10:50 -0000 1.197
+++ Makefile.tpl 27 Nov 2008 17:13:32 -0000
@@ -199,6 +199,10 @@
TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
GMPINC="$(HOST_GMPINC)"; export GMPINC; \
+ PPLLIBS="$(HOST_PPLLIBS)"; export PPLLIBS; \
+ PPLINC="$(HOST_PPLINC)"; export PPLINC; \
+ CLOOGLIBS="$(HOST_CLOOGLIBS)"; export CLOOGLIBS; \
+ CLOOGINC="$(HOST_CLOOGINC)"; export CLOOGINC; \
@if gcc-bootstrap
$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
@endif gcc-bootstrap
@@ -258,6 +262,14 @@
HOST_GMPLIBS = @gmplibs@
HOST_GMPINC = @gmpinc@
+# Where to find PPL
+HOST_PPLLIBS = @ppllibs@
+HOST_PPLINC = @pplinc@
+
+# Where to find CLOOG
+HOST_CLOOGLIBS = @clooglibs@
+HOST_CLOOGINC = @clooginc@
+
# ----------------------------------------------
# Programs producing files for the BUILD machine
# ----------------------------------------------
Index: config-ml.in
===================================================================
RCS file: /cvs/src/src/config-ml.in,v
retrieving revision 1.21
diff -u -r1.21 config-ml.in
--- config-ml.in 29 Nov 2007 15:36:39 -0000 1.21
+++ config-ml.in 27 Nov 2008 17:13:32 -0000
@@ -135,7 +135,12 @@
*) optarg=yes ;;
esac
enableopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
- eval $enableopt="$optarg"
+ # enable_shared and enable_static are handled by configure.
+ # Don't undo its work.
+ case $enableopt in
+ enable_shared | enable_static) ;;
+ *) eval $enableopt="$optarg" ;;
+ esac
;;
--norecursion | --no-recursion)
ml_norecursion=yes
@@ -382,28 +387,6 @@
esac
done
fi
- case " $multidirs " in
- *" mabi=64 "*)
- # We will not be able to create libraries with -mabi=64 if
- # we cannot even link a trivial program. It usually
- # indicates the 64bit libraries are missing.
- if echo 'main() {}' > conftest.c &&
- ${CC-gcc} -mabi=64 conftest.c -o conftest; then
- :
- else
- echo Could not link program with -mabi=64, disabling it.
- old_multidirs="${multidirs}"
- multidirs=""
- for x in ${old_multidirs}; do
- case "$x" in
- *mabi=64* ) : ;;
- *) multidirs="${multidirs} ${x}" ;;
- esac
- done
- fi
- rm -f conftest.c conftest
- ;;
- esac
;;
powerpc*-*-* | rs6000*-*-*)
if [ x$enable_aix64 = xno ]
@@ -495,30 +478,6 @@
done
fi
;;
-sparc*-*-*)
- case " $multidirs " in
- *" m64 "*)
- # We will not be able to create libraries with -m64 if
- # we cannot even link a trivial program. It usually
- # indicates the 64bit libraries are missing.
- if echo 'main() {}' > conftest.c &&
- ${CC-gcc} -m64 conftest.c -o conftest; then
- :
- else
- echo Could not link program with -m64, disabling it.
- old_multidirs="${multidirs}"
- multidirs=""
- for x in ${old_multidirs}; do
- case "$x" in
- *m64* ) : ;;
- *) multidirs="${multidirs} ${x}" ;;
- esac
- done
- fi
- rm -f conftest.c conftest
- ;;
- esac
- ;;
esac
# Remove extraneous blanks from multidirs.
Index: configure.ac
===================================================================
RCS file: /cvs/src/src/configure.ac,v
retrieving revision 1.55
diff -u -r1.55 configure.ac
--- configure.ac 27 Nov 2008 15:20:39 -0000 1.55
+++ configure.ac 27 Nov 2008 17:13:34 -0000
@@ -158,7 +158,7 @@
# these libraries are used by various programs built for the host environment
#
-host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr"
+host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr ppl cloog"
# these tools are built for the host environment
# Note, the powerpc-eabi build depends on sim occurring before gdb in order to
@@ -895,8 +895,6 @@
;;
sparc-*-solaris* | sparc64-*-solaris* | sparcv9-*-solaris*)
;;
- spu-*-*)
- ;;
v810-*-*)
noconfigdirs="$noconfigdirs bfd binutils gas gcc gdb ld target-libstdc++-v3 opcodes target-libgloss ${libgcj}"
;;
@@ -1270,11 +1268,11 @@
if test x"$have_gmp" = xyes; then
saved_LIBS="$LIBS"
LIBS="$LIBS $gmplibs"
- dnl MPFR 2.2.1 is acceptable, but MPFR 2.3.0 is better.
+ dnl MPFR 2.3.0 is acceptable, but MPFR 2.3.2 is better.
AC_MSG_CHECKING([for correct version of mpfr.h])
AC_TRY_LINK([#include <gmp.h>
#include <mpfr.h>],[
- #if MPFR_VERSION < MPFR_VERSION_NUM(2,2,1)
+ #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,0)
choke me
#endif
mpfr_t n;
@@ -1287,7 +1285,7 @@
mpfr_subnormalize (x, t, GMP_RNDN);
], [AC_TRY_LINK([#include <gmp.h>
#include <mpfr.h>],[
- #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,0)
+ #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,2)
choke me
#endif
mpfr_t n; mpfr_init(n);
@@ -1298,7 +1296,7 @@
CFLAGS="$saved_CFLAGS"
if test x$have_gmp != xyes; then
- AC_MSG_ERROR([Building GCC requires GMP 4.1+ and MPFR 2.3.0+.
+ AC_MSG_ERROR([Building GCC requires GMP 4.1+ and MPFR 2.3.2+.
Try the --with-gmp and/or --with-mpfr options to specify their locations.
Copies of these libraries' source code can be found at their respective
hosting sites as well as at ftp://gcc.gnu.org/pub/gcc/infrastructure/.
@@ -1313,6 +1311,115 @@
AC_SUBST(gmplibs)
AC_SUBST(gmpinc)
+
+# Check for PPL
+ppl_major_version=0
+ppl_minor_version=10
+ppllibs=
+pplinc=
+
+AC_ARG_WITH(ppl, [ --with-ppl=PATH Specify prefix directory for the installed PPL package
+ Equivalent to --with-ppl-include=PATH/include
+ plus --with-ppl-lib=PATH/lib])
+AC_ARG_WITH(ppl_include, [ --with-ppl-include=PATH Specify directory for installed PPL include files])
+AC_ARG_WITH(ppl_lib, [ --with-ppl-lib=PATH Specify the directory for the installed PPL library])
+
+if test "x$with_ppl" != x; then
+ ppllibs="-L$with_ppl/lib -lppl_c -lppl -lgmpxx"
+ pplinc="-I$with_ppl/include $pplinc"
+ LIBS="$ppllibs $LIBS"
+fi
+if test "x$with_ppl_include" != x; then
+ pplinc="-I$with_ppl_include $pplinc"
+fi
+if test "x$with_ppl_lib" != x; then
+ ppllibs="-L$with_ppl_lib -lppl_c -lppl -lgmpxx"
+ LIBS="$ppllibs $LIBS"
+fi
+if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
+ ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/.libs -L$$r/$(HOST_SUBDIR)/ppl/_libs -lppl_c -lppl -lgmpxx '
+ pplinc='-I$$r/$(HOST_SUBDIR)/ppl/include -I$$s/ppl/include '
+ LIBS="$ppllibs $LIBS"
+fi
+
+AC_ARG_ENABLE(ppl-version-check,
+[ --disable-ppl-version-check disable check for PPL version],
+ENABLE_PPL_CHECK=$enableval,
+ENABLE_PPL_CHECK=yes)
+
+if test "${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_TRY_COMPILE([#include "ppl_c.h"],[
+ #if PPL_VERSION_MAJOR != $ppl_major_version || PPL_VERSION_MINOR != $ppl_minor_version
+ choke me
+ #endif
+ ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ])
+ CFLAGS="$saved_CFLAGS"
+fi
+
+# Flags needed for PPL
+AC_SUBST(ppllibs)
+AC_SUBST(pplinc)
+
+
+# Check for CLOOG
+clooglibs=" -lcloog "
+clooginc=" -DCLOOG_PPL_BACKEND "
+
+AC_ARG_WITH(cloog, [ --with-cloog=PATH Specify prefix directory for the installed CLooG-PPL package
+ Equivalent to --with-cloog-include=PATH/include
+ plus --with-cloog-lib=PATH/lib])
+AC_ARG_WITH(cloog_include, [ --with-cloog-include=PATH Specify directory for installed CLooG include files])
+AC_ARG_WITH(cloog_lib, [ --with-cloog-lib=PATH Specify the directory for the installed CLooG library])
+AC_ARG_WITH(cloog-polylib, [ --with-cloog-polylib=PATH Specify prefix directory for the installed CLooG-PolyLib package])
+
+if test "x$with_cloog" != x; then
+ clooglibs="-L$with_cloog/lib -lcloog"
+ clooginc="-I$with_cloog/include -DCLOOG_PPL_BACKEND "
+ LIBS="$clooglibs $LIBS"
+fi
+if test "x$with_cloog_polylib" != x; then
+ clooglibs="-L$with_cloog/lib -lcloog"
+ clooginc="-I$with_cloog/include "
+ LIBS="$clooglibs $LIBS"
+fi
+if test "x$with_cloog_include" != x; then
+ clooginc="-I$with_cloog_include -DCLOOG_PPL_BACKEND "
+fi
+if test "x$with_cloog_lib" != x; then
+ clooglibs="-L$with_cloog_lib -lcloog"
+ LIBS="$clooglibs $LIBS"
+fi
+if test "x$with_cloog$with_cloog_include$with_cloog_lib" = x && test -d ${srcdir}/cloog; then
+ clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/.libs -L$$r/$(HOST_SUBDIR)/cloog/_libs -lcloog '
+ clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -DCLOOG_PPL_BACKEND '
+ LIBS="$clooglibs $LIBS"
+fi
+
+AC_ARG_ENABLE(cloog-version-check,
+[ --disable-cloog-version-check disable check for CLooG version],
+ENABLE_CLOOG_CHECK=$enableval,
+ENABLE_CLOOG_CHECK=yes)
+
+if test "${ENABLE_CLOOG_CHECK}" = "yes"; then
+ saved_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $clooginc $gmpinc $pplinc"
+ AC_MSG_CHECKING([for correct version of CLooG])
+ AC_TRY_COMPILE([#include "cloog/cloog.h"],[
+ #if CLOOG_VERSION_MAJOR != 0 || CLOOG_VERSION_MINOR != 15
+ choke me
+ #endif
+ ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); clooglibs= ; clooginc= ])
+ CFLAGS="$saved_CFLAGS"
+fi
+
+# Flags needed for CLOOG
+AC_SUBST(clooglibs)
+AC_SUBST(clooginc)
+
+
# By default, C is the only stage 1 language.
stage1_languages=,c,
@@ -2062,6 +2169,8 @@
esac
# On systems where the dynamic library environment variable is PATH,
+# gcc/ will put dynamic libraries into a subdirectory to avoid adding
+# built executables to PATH.
if test "$RPATH_ENVVAR" = PATH; then
GCC_SHLIB_SUBDIR=/shlib
else
--
Joseph S. Myers
joseph@codesourcery.com