diff options
| -rw-r--r-- | ChangeLog | 33 | ||||
| -rw-r--r-- | bfd/ChangeLog | 4 | ||||
| -rwxr-xr-x | bfd/configure | 44 | ||||
| -rw-r--r-- | config/ChangeLog | 11 | ||||
| -rw-r--r-- | config/elf.m4 | 2 | ||||
| -rw-r--r-- | config/stdint.m4 | 44 | ||||
| -rwxr-xr-x | configure | 96 | ||||
| -rw-r--r-- | configure.ac | 50 |
8 files changed, 259 insertions, 25 deletions
@@ -1,3 +1,36 @@ +2010-06-01 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + Sync from GCC: + + 2010-05-05 Sebastian Pop <sebastian.pop@amd.com> + * configure.ac: Allow all the versions greater than 0.10 of PPL. + * configure: Regenerated. + + 2010-04-20 Eric Botcazou <ebotcazou@adacore.com> + * configure.ac (BUILD_CONFIG): Redirect output to /dev/null. + * configure: Regenerate. + + 2010-04-17 Ralf Cors<E9>pius <ralf.corsepius@rtems.org> + * configure.ac (*-*-rtems*): Add target-libiberty to $skipdirs. + * configure: Regenerate. + + 2010-04-16 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + * configure.ac: Check for elf_getshdrstrndx or elf_getshstrndx + separately. + * configure: Regenerate. + + 2010-04-13 Steve Ellcey <sje@cup.hp.com> + * configure: Regenerate after change to elf.m4. + + 2010-04-02 Sebastian Pop <sebastian.pop@amd.com> + * configure.ac: Add brackets around AC_TRY_COMPILE alternative. + * configure: Regenerated. + + 2010-04-02 Sebastian Pop <sebastian.pop@amd.com> + * configure.ac: Print "buggy but acceptable" when CLooG + revision is less than 9. + * configure: Regenerated. + 2010-05-26 Dave Korn <dave.korn.cygwin@gmail.com> Merge from gcc: diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 69d1240..dc05471 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2010-06-01 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + * configure: Regenerate. + 2010-06-01 Tristan Gingold <gingold@adacore.com> * vms-alpha.c (struct vms_private_data_struct): Add diff --git a/bfd/configure b/bfd/configure index 310bb6a..04c6989 100755 --- a/bfd/configure +++ b/bfd/configure @@ -18200,49 +18200,61 @@ if test "$acx_cv_header_stdint" = stddef.h; then #define _UINT8_T #ifndef __uint8_t_defined #define __uint8_t_defined + #ifndef uint8_t typedef unsigned $acx_cv_type_int8_t uint8_t; #endif #endif + #endif #ifndef _UINT16_T #define _UINT16_T #ifndef __uint16_t_defined #define __uint16_t_defined + #ifndef uint16_t typedef unsigned $acx_cv_type_int16_t uint16_t; #endif #endif + #endif #ifndef _UINT32_T #define _UINT32_T #ifndef __uint32_t_defined #define __uint32_t_defined + #ifndef uint32_t typedef unsigned $acx_cv_type_int32_t uint32_t; #endif #endif + #endif #ifndef _INT8_T #define _INT8_T #ifndef __int8_t_defined #define __int8_t_defined + #ifndef int8_t typedef $acx_cv_type_int8_t int8_t; #endif #endif + #endif #ifndef _INT16_T #define _INT16_T #ifndef __int16_t_defined #define __int16_t_defined + #ifndef int16_t typedef $acx_cv_type_int16_t int16_t; #endif #endif + #endif #ifndef _INT32_T #define _INT32_T #ifndef __int32_t_defined #define __int32_t_defined + #ifndef int32_t typedef $acx_cv_type_int32_t int32_t; #endif #endif + #endif EOF elif test "$ac_cv_type_u_int32_t" = yes; then sed 's/^ *//' >> tmp-stdint.h <<EOF @@ -18262,25 +18274,31 @@ elif test "$ac_cv_type_u_int32_t" = yes; then #define _UINT8_T #ifndef __uint8_t_defined #define __uint8_t_defined + #ifndef uint8_t typedef u_int8_t uint8_t; #endif #endif + #endif #ifndef _UINT16_T #define _UINT16_T #ifndef __uint16_t_defined #define __uint16_t_defined + #ifndef uint16_t typedef u_int16_t uint16_t; #endif #endif + #endif #ifndef _UINT32_T #define _UINT32_T #ifndef __uint32_t_defined #define __uint32_t_defined + #ifndef uint32_t typedef u_int32_t uint32_t; #endif #endif + #endif EOF else sed 's/^ *//' >> tmp-stdint.h <<EOF @@ -18330,9 +18348,11 @@ elif test "$ac_cv_type_u_int64_t" = yes; then #define _UINT64_T #ifndef __uint64_t_defined #define __uint64_t_defined + #ifndef uint64_t typedef u_int64_t uint64_t; #endif #endif + #endif EOF elif test -n "$acx_cv_type_int64_t"; then sed 's/^ *//' >> tmp-stdint.h <<EOF @@ -18340,15 +18360,19 @@ elif test -n "$acx_cv_type_int64_t"; then /* architecture has a 64-bit type, $acx_cv_type_int64_t */ #ifndef _INT64_T #define _INT64_T + #ifndef int64_t typedef $acx_cv_type_int64_t int64_t; #endif + #endif #ifndef _UINT64_T #define _UINT64_T #ifndef __uint64_t_defined #define __uint64_t_defined + #ifndef uint64_t typedef unsigned $acx_cv_type_int64_t uint64_t; #endif #endif + #endif EOF else sed 's/^ *//' >> tmp-stdint.h <<EOF @@ -18358,13 +18382,17 @@ else #ifndef _INT64_T #define _INT64_T #ifndef __int64_t_defined + #ifndef int64_t typedef long long int64_t; #endif #endif + #endif #ifndef _UINT64_T #define _UINT64_T + #ifndef uint64_t typedef unsigned long long uint64_t; #endif + #endif #elif defined __GNUC__ && defined (__STDC__) && __STDC__-0 /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and @@ -18376,24 +18404,32 @@ else # ifndef _INT64_T # define _INT64_T + # ifndef int64_t __extension__ typedef long long int64_t; # endif + # endif # ifndef _UINT64_T # define _UINT64_T + # ifndef uint64_t __extension__ typedef unsigned long long uint64_t; # endif + # endif #elif !defined __STRICT_ANSI__ # if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__ # ifndef _INT64_T # define _INT64_T + # ifndef int64_t typedef __int64 int64_t; # endif + # endif # ifndef _UINT64_T # define _UINT64_T + # ifndef uint64_t typedef unsigned __int64 uint64_t; # endif + # endif # endif /* compiler */ #endif /* ANSI version */ @@ -18406,11 +18442,15 @@ if test "$ac_cv_type_uintptr_t" != yes; then /* Define intptr_t based on sizeof(void*) = $ac_cv_sizeof_void_p */ #ifndef __uintptr_t_defined + #ifndef uintptr_t typedef u$acx_cv_type_intptr_t uintptr_t; #endif + #endif #ifndef __intptr_t_defined + #ifndef intptr_t typedef $acx_cv_type_intptr_t intptr_t; #endif + #endif EOF fi @@ -18460,16 +18500,20 @@ if test "$ac_cv_type_uintmax_t" != yes; then sed 's/^ *//' >> tmp-stdint.h <<EOF /* Define intmax based on what we found */ + #ifndef intmax_t #ifdef _INT64_T typedef int64_t intmax_t; #else typedef long intmax_t; #endif + #endif + #ifndef uintmax_t #ifdef _UINT64_T typedef uint64_t uintmax_t; #else typedef unsigned long uintmax_t; #endif + #endif EOF fi diff --git a/config/ChangeLog b/config/ChangeLog index 9593e9a..140e2ce 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,14 @@ +2010-06-01 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + Sync from GCC: + + 2010-04-13 Steve Ellcey <sje@cup.hp.com> + * elf.m4: Add hppa[12]*-*-hpux* to list of non-elf platforms. + + 2010-01-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + * stdint.m4 (GCC_HEADER_STDINT): Don't typedef uint8_t etc. if + corresponding macros already exist. + 2010-02-15 Nick Clifton <nickc@redhat.com> * elf.m4: Import from gcc mainline. diff --git a/config/elf.m4 b/config/elf.m4 index 44d0249..007006e 100644 --- a/config/elf.m4 +++ b/config/elf.m4 @@ -15,7 +15,7 @@ target_elf=no case $target in *-darwin* | *-aix* | *-cygwin* | *-mingw* | *-aout* | *-*coff* | \ *-msdosdjgpp* | *-netware* | *-vms* | *-wince* | *-*-pe* | \ - alpha*-dec-osf* | *-interix*) + alpha*-dec-osf* | *-interix* | hppa[[12]]*-*-hpux*) target_elf=no ;; *) diff --git a/config/stdint.m4 b/config/stdint.m4 index b26b4fc..d63081d 100644 --- a/config/stdint.m4 +++ b/config/stdint.m4 @@ -234,49 +234,61 @@ if test "$acx_cv_header_stdint" = stddef.h; then #define _UINT8_T #ifndef __uint8_t_defined #define __uint8_t_defined + #ifndef uint8_t typedef unsigned $acx_cv_type_int8_t uint8_t; #endif #endif + #endif #ifndef _UINT16_T #define _UINT16_T #ifndef __uint16_t_defined #define __uint16_t_defined + #ifndef uint16_t typedef unsigned $acx_cv_type_int16_t uint16_t; #endif #endif + #endif #ifndef _UINT32_T #define _UINT32_T #ifndef __uint32_t_defined #define __uint32_t_defined + #ifndef uint32_t typedef unsigned $acx_cv_type_int32_t uint32_t; #endif #endif + #endif #ifndef _INT8_T #define _INT8_T #ifndef __int8_t_defined #define __int8_t_defined + #ifndef int8_t typedef $acx_cv_type_int8_t int8_t; #endif #endif + #endif #ifndef _INT16_T #define _INT16_T #ifndef __int16_t_defined #define __int16_t_defined + #ifndef int16_t typedef $acx_cv_type_int16_t int16_t; #endif #endif + #endif #ifndef _INT32_T #define _INT32_T #ifndef __int32_t_defined #define __int32_t_defined + #ifndef int32_t typedef $acx_cv_type_int32_t int32_t; #endif #endif + #endif EOF elif test "$ac_cv_type_u_int32_t" = yes; then sed 's/^ *//' >> tmp-stdint.h <<EOF @@ -296,25 +308,31 @@ elif test "$ac_cv_type_u_int32_t" = yes; then #define _UINT8_T #ifndef __uint8_t_defined #define __uint8_t_defined + #ifndef uint8_t typedef u_int8_t uint8_t; #endif #endif + #endif #ifndef _UINT16_T #define _UINT16_T #ifndef __uint16_t_defined #define __uint16_t_defined + #ifndef uint16_t typedef u_int16_t uint16_t; #endif #endif + #endif #ifndef _UINT32_T #define _UINT32_T #ifndef __uint32_t_defined #define __uint32_t_defined + #ifndef uint32_t typedef u_int32_t uint32_t; #endif #endif + #endif EOF else sed 's/^ *//' >> tmp-stdint.h <<EOF @@ -364,9 +382,11 @@ elif test "$ac_cv_type_u_int64_t" = yes; then #define _UINT64_T #ifndef __uint64_t_defined #define __uint64_t_defined + #ifndef uint64_t typedef u_int64_t uint64_t; #endif #endif + #endif EOF elif test -n "$acx_cv_type_int64_t"; then sed 's/^ *//' >> tmp-stdint.h <<EOF @@ -374,15 +394,19 @@ elif test -n "$acx_cv_type_int64_t"; then /* architecture has a 64-bit type, $acx_cv_type_int64_t */ #ifndef _INT64_T #define _INT64_T + #ifndef int64_t typedef $acx_cv_type_int64_t int64_t; #endif + #endif #ifndef _UINT64_T #define _UINT64_T #ifndef __uint64_t_defined #define __uint64_t_defined + #ifndef uint64_t typedef unsigned $acx_cv_type_int64_t uint64_t; #endif #endif + #endif EOF else sed 's/^ *//' >> tmp-stdint.h <<EOF @@ -392,13 +416,17 @@ else #ifndef _INT64_T #define _INT64_T #ifndef __int64_t_defined + #ifndef int64_t typedef long long int64_t; #endif #endif + #endif #ifndef _UINT64_T #define _UINT64_T + #ifndef uint64_t typedef unsigned long long uint64_t; #endif + #endif #elif defined __GNUC__ && defined (__STDC__) && __STDC__-0 /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and @@ -410,24 +438,32 @@ else # ifndef _INT64_T # define _INT64_T + # ifndef int64_t __extension__ typedef long long int64_t; # endif + # endif # ifndef _UINT64_T # define _UINT64_T + # ifndef uint64_t __extension__ typedef unsigned long long uint64_t; # endif + # endif #elif !defined __STRICT_ANSI__ # if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__ # ifndef _INT64_T # define _INT64_T + # ifndef int64_t typedef __int64 int64_t; # endif + # endif # ifndef _UINT64_T # define _UINT64_T + # ifndef uint64_t typedef unsigned __int64 uint64_t; # endif + # endif # endif /* compiler */ #endif /* ANSI version */ @@ -440,11 +476,15 @@ if test "$ac_cv_type_uintptr_t" != yes; then /* Define intptr_t based on sizeof(void*) = $ac_cv_sizeof_void_p */ #ifndef __uintptr_t_defined + #ifndef uintptr_t typedef u$acx_cv_type_intptr_t uintptr_t; #endif + #endif #ifndef __intptr_t_defined + #ifndef intptr_t typedef $acx_cv_type_intptr_t intptr_t; #endif + #endif EOF fi @@ -496,16 +536,20 @@ if test "$ac_cv_type_uintmax_t" != yes; then sed 's/^ *//' >> tmp-stdint.h <<EOF /* Define intmax based on what we found */ + #ifndef intmax_t #ifdef _INT64_T typedef int64_t intmax_t; #else typedef long intmax_t; #endif + #endif + #ifndef uintmax_t #ifdef _UINT64_T typedef uint64_t uintmax_t; #else typedef unsigned long uintmax_t; #endif + #endif EOF fi @@ -3311,6 +3311,7 @@ case "${target}" in noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj} target-libmudflap" ;; *-*-rtems*) + skipdirs="${skipdirs} target-libiberty" noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" ;; # The tpf target doesn't support gdb yet. @@ -5493,7 +5494,8 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then # Check for the recommended and required versions of GMP. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the correct version of gmp.h" >&5 $as_echo_n "checking for the correct version of gmp.h... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "gmp.h" int @@ -5511,8 +5513,7 @@ main () } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <gmp.h> int @@ -5800,8 +5801,6 @@ fi # Check for PPL -ppl_major_version=0 -ppl_minor_version=10 ppllibs=" -lppl_c -lppl -lgmpxx" pplinc= @@ -5858,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" @@ -5867,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 @@ -5971,9 +5970,30 @@ main () } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include "cloog/cloog.h" +int +main () +{ + + #if CLOOG_VERSION_MAJOR != 0 || CLOOG_VERSION_MINOR != 15 || CLOOG_VERSION_REVISION < 9 + choke me + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: buggy but acceptable" >&5 +$as_echo "buggy but acceptable" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; }; clooglibs= ; clooginc= fi @@ -6400,7 +6420,7 @@ target_elf=no case $target in *-darwin* | *-aix* | *-cygwin* | *-mingw* | *-aout* | *-*coff* | \ *-msdosdjgpp* | *-netware* | *-vms* | *-wince* | *-*-pe* | \ - alpha*-dec-osf* | *-interix*) + alpha*-dec-osf* | *-interix* | hppa[12]*-*-hpux*) target_elf=no ;; *) @@ -6561,7 +6581,6 @@ main () elf_nextscn (0, 0); elf_strptr (0, 0, 0); elf_getident (0, 0); - elf_getshdrstrndx (0, 0); elf_begin (0, 0, 0); elf_ndxscn (0); elf_end (0); @@ -6581,6 +6600,61 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + # Check for elf_getshdrstrndx or elf_getshstrndx. The latter's flavor + # is determined in gcc/configure.ac. + if test x"$enable_lto" = x"yes" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for elf_getshdrstrndx" >&5 +$as_echo_n "checking for elf_getshdrstrndx... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <libelf.h> +int +main () +{ + + elf_getshdrstrndx (0, 0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; }; +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; }; + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for elf_getshstrndx" >&5 +$as_echo_n "checking for elf_getshstrndx... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <libelf.h> +int +main () +{ + + elf_getshstrndx (0, 0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; }; +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; }; enable_lto=no; libelflibs= ; libelfinc= + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + fi + # If we couldn't enable LTO and the user forced it, emit an error. if test x"$enable_lto" = x"no" \ && test x"$default_enable_lto" != x"yes" ; then @@ -7619,7 +7693,7 @@ else mv conftest.o conftest.o.g0 && ${CC} -c -g conftest.c && mv conftest.o conftest.o.g && - ${srcdir}/contrib/compare-debug conftest.o.g0 conftest.o.g; then + ${srcdir}/contrib/compare-debug conftest.o.g0 conftest.o.g > /dev/null 2>&1; then : else BUILD_CONFIG= diff --git a/configure.ac b/configure.ac index 507ab54..f78c527 100644 --- a/configure.ac +++ b/configure.ac @@ -548,6 +548,7 @@ case "${target}" in noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj} target-libmudflap" ;; *-*-rtems*) + skipdirs="${skipdirs} target-libiberty" noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" ;; # The tpf target doesn't support gdb yet. @@ -1374,13 +1375,13 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then #if GCC_GMP_VERSION < GCC_GMP_VERSION_NUM(4,2,0) choke me #endif - ], AC_TRY_COMPILE([#include <gmp.h>],[ + ], [AC_TRY_COMPILE([#include <gmp.h>],[ #define GCC_GMP_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) #define GCC_GMP_VERSION GCC_GMP_VERSION_NUM(__GNU_MP_VERSION,__GNU_MP_VERSION_MINOR,__GNU_MP_VERSION_PATCHLEVEL) #if GCC_GMP_VERSION < GCC_GMP_VERSION_NUM(4,3,2) choke me #endif - ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])]), + ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])])], [AC_MSG_RESULT([no]); have_gmp=no]) # If we have GMP, check the MPFR version. @@ -1392,12 +1393,12 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,1) choke me #endif - ], AC_TRY_COMPILE([#include <gmp.h> + ], [AC_TRY_COMPILE([#include <gmp.h> #include <mpfr.h>],[ #if MPFR_VERSION < MPFR_VERSION_NUM(2,4,2) choke me #endif - ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])]), + ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])])], [AC_MSG_RESULT([no]); have_gmp=no]) fi @@ -1409,11 +1410,11 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then #if MPC_VERSION < MPC_VERSION_NUM(0,8,0) choke me #endif - ], AC_TRY_COMPILE([#include <mpc.h>],[ + ], [AC_TRY_COMPILE([#include <mpc.h>],[ #if MPC_VERSION < MPC_VERSION_NUM(0,8,1) choke me #endif - ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])]), + ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])])], [AC_MSG_RESULT([no]); have_gmp=no]) fi @@ -1530,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= @@ -1572,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 ]) @@ -1637,7 +1636,12 @@ if test "x$with_cloog" != "xno" -a "${ENABLE_CLOOG_CHECK}" = "yes"; then #if CLOOG_VERSION_MAJOR != 0 || CLOOG_VERSION_MINOR != 15 || CLOOG_VERSION_REVISION < 5 choke me #endif - ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); clooglibs= ; clooginc= ]) + ], [AC_TRY_COMPILE([#include "cloog/cloog.h"],[ + #if CLOOG_VERSION_MAJOR != 0 || CLOOG_VERSION_MINOR != 15 || CLOOG_VERSION_REVISION < 9 + choke me + #endif + ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])])], + [AC_MSG_RESULT([no]); clooglibs= ; clooginc= ]) CFLAGS="$saved_CFLAGS" fi @@ -1741,7 +1745,6 @@ ACX_ELF_TARGET_IFELSE([if test x"$enable_lto" = x"yes" ; then elf_nextscn (0, 0); elf_strptr (0, 0, 0); elf_getident (0, 0); - elf_getshdrstrndx (0, 0); elf_begin (0, 0, 0); elf_ndxscn (0); elf_end (0); @@ -1750,6 +1753,27 @@ ACX_ELF_TARGET_IFELSE([if test x"$enable_lto" = x"yes" ; then [AC_MSG_RESULT([no]); enable_lto=no; libelflibs= ; libelfinc= ] ) + # Check for elf_getshdrstrndx or elf_getshstrndx. The latter's flavor + # is determined in gcc/configure.ac. + if test x"$enable_lto" = x"yes" ; then + AC_MSG_CHECKING([for elf_getshdrstrndx]) + AC_TRY_LINK( + [#include <libelf.h>],[ + elf_getshdrstrndx (0, 0); + ], + [AC_MSG_RESULT([yes]);], + [AC_MSG_RESULT([no]); + AC_MSG_CHECKING([for elf_getshstrndx]) + AC_TRY_LINK( + [#include <libelf.h>],[ + elf_getshstrndx (0, 0); + ], + [AC_MSG_RESULT([yes]);], + [AC_MSG_RESULT([no]); enable_lto=no; libelflibs= ; libelfinc= ] + )] + ) + fi + # If we couldn't enable LTO and the user forced it, emit an error. if test x"$enable_lto" = x"no" \ && test x"$default_enable_lto" != x"yes" ; then @@ -2723,7 +2747,7 @@ else mv conftest.o conftest.o.g0 && ${CC} -c -g conftest.c && mv conftest.o conftest.o.g && - ${srcdir}/contrib/compare-debug conftest.o.g0 conftest.o.g; then + ${srcdir}/contrib/compare-debug conftest.o.g0 conftest.o.g > /dev/null 2>&1; then : else BUILD_CONFIG= |