From 29383458d39ad1b10a4e5e3dacfaed90cc989320 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 16 Mar 2009 13:29:49 +0000 Subject: [PATCH] Merge from GCC: 2009-03-16 Joseph Myers * configure.ac (--with-host-libstdcxx): New option. * configure: Regenerate. 2009-01-29 Robert Millan * configure.ac: Recognize GNU/kOpenSolaris (*-*-kopensolaris*-gnu). * configure: Regenerate. 2009-01-12 Sebastian Pop PR tree-optimization/38515 * configure.ac (cloog-polylib): Removed. (with_ppl, with_cloog): Test for "no". * configure: Regenerated. --- ChangeLog | 21 +++++++++++++++ configure | 74 ++++++++++++++++++++++++++++++++-------------------- configure.ac | 60 ++++++++++++++++++++++++++---------------- 3 files changed, 103 insertions(+), 52 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ee93843751..3166bf9ba08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2009-03-16 Joseph Myers + + Merge from GCC: + + 2009-03-16 Joseph Myers + + * configure.ac (--with-host-libstdcxx): New option. + * configure: Regenerate. + + 2009-01-29 Robert Millan + + * configure.ac: Recognize GNU/kOpenSolaris (*-*-kopensolaris*-gnu). + * configure: Regenerate. + + 2009-01-12 Sebastian Pop + + PR tree-optimization/38515 + * configure.ac (cloog-polylib): Removed. + (with_ppl, with_cloog): Test for "no". + * configure: Regenerated. + 2009-03-01 Ralf Wildenhues Backport from git Libtool: diff --git a/configure b/configure index 26d7b2fab43..fc95fec8450 100755 --- a/configure +++ b/configure @@ -969,6 +969,8 @@ Optional Packages: plus --with-gmp-lib=PATH/lib --with-gmp-include=PATH specify directory for installed GMP include files --with-gmp-lib=PATH specify directory for the installed GMP library + --with-host-libstdcxx=L Use linker arguments L to link with libstdc++ + when linking 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 @@ -979,7 +981,6 @@ Optional Packages: plus --with-cloog-lib=PATH/lib --with-cloog-include=PATH Specify directory for installed CLooG include files --with-cloog-lib=PATH Specify the directory for the installed CLooG library - --with-cloog-polylib=PATH Specify prefix directory for the installed CLooG-PolyLib package --with-build-sysroot=SYSROOT use sysroot as the system root during the build --with-debug-prefix-map='A=B C=D ...' @@ -2172,7 +2173,7 @@ esac # Disable libmudflap on some systems. if test x$enable_libmudflap = x ; then case "${target}" in - *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | bfin*-*-uclinux*) + *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | bfin*-*-uclinux* | *-*-kopensolaris*-gnu) # Enable libmudflap by default in GNU and friends. ;; *-*-freebsd*) @@ -2189,7 +2190,7 @@ fi if test x$enable_libgomp = x ; then # Enable libgomp by default on hosted POSIX systems. case "${target}" in - *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu) + *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu) ;; *-*-netbsd* | *-*-freebsd* | *-*-openbsd*) ;; @@ -2687,7 +2688,7 @@ case "${target}" in ip2k-*-*) noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}" ;; - *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu) + *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu) noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; *-*-lynxos*) @@ -4809,11 +4810,26 @@ fi +# Allow host libstdc++ to be specified for static linking with PPL. + +# Check whether --with-host-libstdcxx or --without-host-libstdcxx was given. +if test "${with_host_libstdcxx+set}" = set; then + withval="$with_host_libstdcxx" + +fi; + +case $with_host_libstdcxx in + no|yes) + { { echo "$as_me:$LINENO: error: -with-host-libstdcxx needs an argument" >&5 +echo "$as_me: error: -with-host-libstdcxx needs an argument" >&2;} + { (exit 1); exit 1; }; } + ;; +esac # Check for PPL ppl_major_version=0 ppl_minor_version=10 -ppllibs=" -lppl_c -lppl -lgmpxx " +ppllibs=" -lppl_c -lppl -lgmpxx $with_host_libstdcxx " pplinc= @@ -4835,20 +4851,25 @@ if test "${with_ppl_lib+set}" = set; then fi; -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 +case $with_ppl in + no) + ppllibs= + ;; + *) + ppllibs="-L$with_ppl/lib -lppl_c -lppl -lgmpxx $with_host_libstdcxx" + pplinc="-I$with_ppl/include $pplinc" + LIBS="$ppllibs $LIBS" + ;; +esac 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" + ppllibs="-L$with_ppl_lib -lppl_c -lppl -lgmpxx $with_host_libstdcxx" 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 ' + ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/.libs -L$$r/$(HOST_SUBDIR)/ppl/_libs -lppl_c -lppl -lgmpxx '"$with_host_libstdcxx " pplinc='-I$$r/$(HOST_SUBDIR)/ppl/include -I$$s/ppl/include ' LIBS="$ppllibs $LIBS" fi @@ -4948,22 +4969,17 @@ if test "${with_cloog_lib+set}" = set; then fi; -# Check whether --with-cloog-polylib or --without-cloog-polylib was given. -if test "${with_cloog_polylib+set}" = set; then - withval="$with_cloog_polylib" - -fi; - -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 +case $with_cloog in + no) + clooglibs= + clooginc= + ;; + *) + clooglibs="-L$with_cloog/lib -lcloog" + clooginc="-I$with_cloog/include -DCLOOG_PPL_BACKEND " + LIBS="$clooglibs $LIBS" + ;; +esac if test "x$with_cloog_include" != x; then clooginc="-I$with_cloog_include -DCLOOG_PPL_BACKEND " fi @@ -5712,7 +5728,7 @@ case "${target}" in *-*-netware*) target_makefile_frag="config/mt-netware" ;; - *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu) + *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu) target_makefile_frag="config/mt-gnu" ;; *-*-aix4.[3456789]* | *-*-aix[56789].*) diff --git a/configure.ac b/configure.ac index ab269c2dc3b..9ac0824a5ed 100644 --- a/configure.ac +++ b/configure.ac @@ -408,7 +408,7 @@ esac # Disable libmudflap on some systems. if test x$enable_libmudflap = x ; then case "${target}" in - *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | bfin*-*-uclinux*) + *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | bfin*-*-uclinux* | *-*-kopensolaris*-gnu) # Enable libmudflap by default in GNU and friends. ;; *-*-freebsd*) @@ -425,7 +425,7 @@ fi if test x$enable_libgomp = x ; then # Enable libgomp by default on hosted POSIX systems. case "${target}" in - *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu) + *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu) ;; *-*-netbsd* | *-*-freebsd* | *-*-openbsd*) ;; @@ -923,7 +923,7 @@ case "${target}" in ip2k-*-*) noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}" ;; - *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu) + *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu) noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; *-*-lynxos*) @@ -1315,11 +1315,20 @@ fi AC_SUBST(gmplibs) AC_SUBST(gmpinc) +# Allow host libstdc++ to be specified for static linking with PPL. +AC_ARG_WITH(host-libstdcxx, [ --with-host-libstdcxx=L Use linker arguments L to link with libstdc++ + when linking with PPL]) + +case $with_host_libstdcxx in + no|yes) + AC_MSG_ERROR([-with-host-libstdcxx needs an argument]) + ;; +esac # Check for PPL ppl_major_version=0 ppl_minor_version=10 -ppllibs=" -lppl_c -lppl -lgmpxx " +ppllibs=" -lppl_c -lppl -lgmpxx $with_host_libstdcxx " pplinc= AC_ARG_WITH(ppl, [ --with-ppl=PATH Specify prefix directory for the installed PPL package @@ -1328,20 +1337,25 @@ AC_ARG_WITH(ppl, [ --with-ppl=PATH Specify prefix directory for the ins 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 +case $with_ppl in + no) + ppllibs= + ;; + *) + ppllibs="-L$with_ppl/lib -lppl_c -lppl -lgmpxx $with_host_libstdcxx" + pplinc="-I$with_ppl/include $pplinc" + LIBS="$ppllibs $LIBS" + ;; +esac 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" + ppllibs="-L$with_ppl_lib -lppl_c -lppl -lgmpxx $with_host_libstdcxx" 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 ' + ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/.libs -L$$r/$(HOST_SUBDIR)/ppl/_libs -lppl_c -lppl -lgmpxx '"$with_host_libstdcxx " pplinc='-I$$r/$(HOST_SUBDIR)/ppl/include -I$$s/ppl/include ' LIBS="$ppllibs $LIBS" fi @@ -1377,18 +1391,18 @@ AC_ARG_WITH(cloog, [ --with-cloog=PATH Specify prefix directory for the i 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 +case $with_cloog in + no) + clooglibs= + clooginc= + ;; + *) + clooglibs="-L$with_cloog/lib -lcloog" + clooginc="-I$with_cloog/include -DCLOOG_PPL_BACKEND " + LIBS="$clooglibs $LIBS" + ;; +esac if test "x$with_cloog_include" != x; then clooginc="-I$with_cloog_include -DCLOOG_PPL_BACKEND " fi @@ -2024,7 +2038,7 @@ case "${target}" in *-*-netware*) target_makefile_frag="config/mt-netware" ;; - *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu) + *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu) target_makefile_frag="config/mt-gnu" ;; *-*-aix4.[[3456789]]* | *-*-aix[[56789]].*) -- 2.30.2