[haiku-commits] buildtools: btrev43057 - in gcc: mpfr mpfr/src gmp/doc mpc gmp

  • From: korli@xxxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 12 May 2013 18:32:16 +0200 (CEST)

btrev43057 adds 3 changesets to branch 'master'
old head: a5171ea3465e20f1f54ea7ffbe06a9bb2fb70c84
new head: 89a807a12696f31463087c5468cd38001ad86fd2
overview: http://cgit.haiku-os.org/buildtools/log/?qt=range&q=89a807a+%5Ea5171ea

----------------------------------------------------------------------------

9504a69: gcc with graphite: libppl.a needs libm
  
  * workaround tested on ubuntu 13.04 x86_64 as a cross build.

                                   [ Jérôme Duval <jerome.duval@xxxxxxxxx> ]

593e726: buildtools: update gmp, mpfr, mpc libs
  
  * gmp to 5.0.5, mpfr to 3.1.2, mpc to 1.0.1

                                   [ Jérôme Duval <jerome.duval@xxxxxxxxx> ]

89a807a: PR bootstrap/50461
  
  * configure.ac (mpfr-dir): When using in-tree MPFR sources
  allow for the fact that from release v3.1.0 of MPFR the source
  files were moved into a src sub-directory.
  * configure: Regenerate.

                      [ nickc <nickc@138bc75d-0d04-0410-961f-82ee72b054a4> ]

----------------------------------------------------------------------------

919 files changed, 83628 insertions(+), 46437 deletions(-)
gcc/ChangeLog                                 |     9 +
gcc/configure                                 |    15 +-
gcc/configure.ac                              |    15 +-
gcc/gmp/ChangeLog                             |   663 +-
gcc/gmp/INSTALL                               |     7 +-
gcc/gmp/Makefile.am                           |    10 +-
gcc/gmp/Makefile.in                           |    16 +-
gcc/gmp/NEWS                                  |   142 +-
gcc/gmp/acinclude.m4                          |    39 +-
gcc/gmp/aclocal.m4                            |  2299 +++--
gcc/gmp/config.guess                          |   154 +-
gcc/gmp/config.in                             |    10 +-
gcc/gmp/config.sub                            |    11 +-
gcc/gmp/configfsf.guess                       |   439 +-
gcc/gmp/configfsf.sub                         |   211 +-
gcc/gmp/configure                             |  5907 ++++++-----
gcc/gmp/configure.in                          |   545 +-
gcc/gmp/cxx/Makefile.in                       |     6 +-
gcc/gmp/demos/Makefile.in                     |     6 +-
gcc/gmp/demos/calc/Makefile.in                |     6 +-
gcc/gmp/demos/calc/calc.c                     |   531 +-
gcc/gmp/demos/calc/calc.h                     |    14 +-
gcc/gmp/demos/calc/calclex.c                  |  1420 +--
gcc/gmp/demos/expr/Makefile.in                |     6 +-
gcc/gmp/demos/factorize.c                     |     6 +-
gcc/gmp/demos/isprime.c                       |     4 +-
gcc/gmp/doc/Makefile.in                       |     6 +-
gcc/gmp/doc/gmp.info                          | 10831 +-------------------
gcc/gmp/doc/gmp.info-1                        |  7070 +++++++++++++
gcc/gmp/doc/gmp.info-2                        |  3598 +++++++
gcc/gmp/doc/gmp.texi                          |   279 +-
gcc/gmp/doc/stamp-vti                         |     8 +-
gcc/gmp/doc/version.texi                      |     8 +-
gcc/gmp/gmp-h.in                              |    19 +-
gcc/gmp/gmp-impl.h                            |    19 +-
gcc/gmp/longlong.h                            |   162 +-
gcc/gmp/ltmain.sh                             |  4017 +++++---
gcc/gmp/mp_get_fns.c                          |     2 +-
gcc/gmp/mp_set_fns.c                          |     2 +-
gcc/gmp/mpbsd/Makefile.in                     |     6 +-
gcc/gmp/mpf/Makefile.in                       |     6 +-
gcc/gmp/mpf/cmp.c                             |     2 +-
gcc/gmp/mpf/cmp_si.c                          |    13 +-
gcc/gmp/mpf/cmp_ui.c                          |     2 +-
gcc/gmp/mpf/fits_s.h                          |     2 +-
gcc/gmp/mpf/fits_u.h                          |     2 +-
gcc/gmp/mpf/get_dfl_prec.c                    |     2 +-
gcc/gmp/mpf/get_prc.c                         |     2 +-
gcc/gmp/mpf/get_si.c                          |     4 +-
gcc/gmp/mpf/get_ui.c                          |     2 +-
gcc/gmp/mpf/int_p.c                           |     2 +-
gcc/gmp/mpf/iset_si.c                         |     2 +-
gcc/gmp/mpf/set_dfl_prec.c                    |     2 +-
gcc/gmp/mpf/set_prc_raw.c                     |     2 +-
gcc/gmp/mpf/set_si.c                          |     2 +-
gcc/gmp/mpf/size.c                            |     2 +-
gcc/gmp/mpf/sub.c                             |    12 +-
gcc/gmp/mpf/swap.c                            |     2 +-
gcc/gmp/mpn/Makefile.am                       |     8 +-
gcc/gmp/mpn/Makefile.in                       |    14 +-
gcc/gmp/mpn/alpha/ev5/gmp-mparam.h            |    12 +-
gcc/gmp/mpn/alpha/ev6/gmp-mparam.h            |    16 +-
gcc/gmp/mpn/arm/invert_limb.asm               |    26 +-
gcc/gmp/mpn/generic/dcpi1_bdiv_q.c            |     5 +-
gcc/gmp/mpn/generic/gcdext.c                  |     5 +-
gcc/gmp/mpn/generic/gcdext_subdiv_step.c      |     8 +-
gcc/gmp/mpn/generic/hgcd.c                    |     4 +-
gcc/gmp/mpn/generic/matrix22_mul.c            |     4 +-
gcc/gmp/mpn/generic/mod_1_3.c                 |     7 +-
gcc/gmp/mpn/generic/mu_div_qr.c               |     9 +
gcc/gmp/mpn/generic/popham.c                  |     4 +-
gcc/gmp/mpn/generic/powm_sec.c                |    34 +-
gcc/gmp/mpn/generic/redc_2.c                  |     2 +-
gcc/gmp/mpn/generic/sqrtrem.c                 |    10 +-
gcc/gmp/mpn/generic/toom33_mul.c              |    12 +-
gcc/gmp/mpn/generic/toom3_sqr.c               |     5 +-
gcc/gmp/mpn/generic/toom63_mul.c              |    12 +-
gcc/gmp/mpn/generic/toom_interpolate_16pts.c  |    12 +-
gcc/gmp/mpn/generic/toom_interpolate_6pts.c   |     4 +-
gcc/gmp/mpn/generic/toom_interpolate_8pts.c   |     5 +-
gcc/gmp/mpn/generic/udiv_w_sdiv.c             |     9 +-
gcc/gmp/mpn/ia64/gmp-mparam.h                 |     8 +-
gcc/gmp/mpn/pa32/gmp-mparam.h                 |    14 +-
gcc/gmp/mpn/pa64/aors_n.asm                   |     9 +-
gcc/gmp/mpn/powerpc32/divrem_2.asm            |    10 +-
gcc/gmp/mpn/powerpc32/gmp-mparam.h            |    20 +-
gcc/gmp/mpn/powerpc64/mode64/p3/gmp-mparam.h  |    12 +-
gcc/gmp/mpn/powerpc64/mode64/p4/gmp-mparam.h  |    30 +-
gcc/gmp/mpn/powerpc64/mode64/p5/gmp-mparam.h  |    48 +-
gcc/gmp/mpn/powerpc64/mode64/p6/gmp-mparam.h  |   189 +
gcc/gmp/mpn/powerpc64/mode64/p7/gmp-mparam.h  |   202 +
gcc/gmp/mpn/s390/gmp-mparam.h                 |    54 -
gcc/gmp/mpn/{s390 => s390_32}/README          |     0
gcc/gmp/mpn/{s390 => s390_32}/addmul_1.asm    |     0
gcc/gmp/mpn/s390_32/gmp-mparam.h              |   121 +
gcc/gmp/mpn/{s390 => s390_32}/mul_1.asm       |     0
gcc/gmp/mpn/{s390 => s390_32}/submul_1.asm    |     0
gcc/gmp/mpn/s390_64/gmp-mparam.h              |   125 +
gcc/gmp/mpn/sh/add_n.asm                      |    48 +
[ *** stats truncated: 820 lines dropped *** ]

############################################################################

Commit:      9504a69542dab6f19a994a09a718e2dfc0907064
URL:         http://cgit.haiku-os.org/buildtools/commit/?id=9504a69
Author:      Jérôme Duval <jerome.duval@xxxxxxxxx>
Date:        Sun May 12 13:48:04 2013 UTC

gcc with graphite: libppl.a needs libm

* workaround tested on ubuntu 13.04 x86_64 as a cross build.

----------------------------------------------------------------------------

diff --git a/gcc/configure b/gcc/configure
index 2791dbc..7b893df 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -5701,7 +5701,7 @@ fi
     LIBS="$saved_LIBS"
   fi
 
-  ppllibs="$ppllibs -lppl_c -lppl $pwllib -lgmpxx"
+  ppllibs="$ppllibs -lppl_c -lppl $pwllib -lgmpxx -lm"
 
   if test "$enable_ppl_version_check" != no; then
     saved_CFLAGS="$CFLAGS"
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 40aeeee..acebd4b 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1570,7 +1570,7 @@ if test "x$with_ppl" != xno; then
     LIBS="$saved_LIBS"
   fi
 
-  ppllibs="$ppllibs -lppl_c -lppl $pwllib -lgmpxx"
+  ppllibs="$ppllibs -lppl_c -lppl $pwllib -lgmpxx -lm"
 
   if test "$enable_ppl_version_check" != no; then
     saved_CFLAGS="$CFLAGS"

############################################################################

Commit:      593e726f686567bc3b41848e9b4f05357a4ecbdf
URL:         http://cgit.haiku-os.org/buildtools/commit/?id=593e726
Author:      Jérôme Duval <jerome.duval@xxxxxxxxx>
Date:        Sun May 12 15:49:33 2013 UTC

buildtools: update gmp, mpfr, mpc libs

* gmp to 5.0.5, mpfr to 3.1.2, mpc to 1.0.1

----------------------------------------------------------------------------

diff --git a/gcc/gmp/ChangeLog b/gcc/gmp/ChangeLog
index b577614..01b90c3 100644
--- a/gcc/gmp/ChangeLog
+++ b/gcc/gmp/ChangeLog
@@ -1,3 +1,665 @@
+2012-05-06  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * Version 5.0.5 released.
+
+       * mpn/Makefile.am (TARG_DIST): Remove thumb, since directory now empty.
+
+2012-04-28  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/thumb/add_n.s: Remove broken code.
+       * mpn/thumb/sub_n.s: Likewise.
+
+2012-04-02  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * gmp-h.in (__GNU_MP_VERSION_PATCHLEVEL): Bump.
+
+       * Makefile.am (LIBGMP_LT_*, LIBGMPXX_LT_*, LIBMP_LT_*):
+       Bump version info.
+
+       * gmp-h.in (_GMP_H_HAVE_FILE): Test also __STDIO_LOADED (for VMS).
+
+2012-03-27  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * config.guess: Fix typo in coreisbr recognition.
+
+2012-03-07  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * config.guess: Handle AMD 11h correctly.
+
+2012-03-04 Marco Bodrato <bodrato@xxxxxxxxxxxxxxxx>
+
+       * tests/mpz/t-invert.c: Avoid testing mod 0.
+       * doc/gmp.texi (mpz_invert): Specify mod 0 is not handled.
+
+2012-02-24  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * tests/mpn/logic.c: New file.
+       * tests/mpn/Makefile.am (check_PROGRAMS): Add logic.
+
+       * tests/mpz/t-invert.c: New file.
+       * tests/mpz/Makefile.am (check_PROGRAMS): Add t-invert.
+
+2012-02-11 Marco Bodrato <bodrato@xxxxxxxxxxxxxxxx>
+
+       * doc/gmp.texi (Multiplication Algorithms): Add Toom[68]'n'half.
+
+2012-02-10  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * Version 5.0.4 released.
+
+2012-02-09 Marco Bodrato <bodrato@xxxxxxxxxxxxxxxx>
+
+       * gmp-impl.h (mpn_toom3*_itch): Support any recursion depth.
+       * tests/refmpn.c (refmpn_mul): Restore tight allocations.
+
+2012-02-09  Marc Glisse  <marc.glisse@xxxxxxxx>
+
+       * gmp-impl.h (ABS_CAST): New macro.
+       * mpf/cmp_si.c: Use ABS_CAST.
+       * mpf/get_si.c: Use ABS_CAST.
+       * mpf/iset_si.c: Use ABS_CAST.
+       * mpf/set_si.c: Use ABS_CAST.
+       * mpq/set_si.c: Use ABS_CAST.
+       * mpz/cmp_si.c: Use ABS_CAST.
+       * mpz/get_si.c: Use ABS_CAST.
+       * mpz/iset_si.c: Use ABS_CAST.
+       * mpz/mul_i.h: Use ABS_CAST.
+       * mpz/set_si.c: Use ABS_CAST.
+
+2012-02-09  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * gmp-h.in (__GNU_MP_VERSION_PATCHLEVEL): Bump.
+
+       * Makefile.am (LIBGMP_LT_*, LIBGMPXX_LT_*, LIBMP_LT_*):
+       Bump version info.
+
+2012-02-08  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/powerpc32/divrem_2.asm: Fix off-by-one condition in invert_limb
+       code.
+
+2012-02-08  Niels M�ller  <nisse@xxxxxxxxxxxxxx>
+
+       * doc/gmp.texi (mpz_gcdext): Describe cofactor canonicalization.
+       (mpn_gcdext): Copied doc updates from main repo.
+
+2012-02-07  Niels M�ller  <nisse@xxxxxxxxxxxxxx>
+
+       * mpn/generic/gcdext.c (mpn_gcdext): Fixed assert, related to the
+       special case A = (2k+1) G, B = 2 G.
+
+2012-02-06  Niels M�ller  <nisse@xxxxxxxxxxxxxx>
+
+       * mpn/generic/hgcd.c (hgcd_matrix_update_q): Fixed carry handling
+       bug.
+
+       * tests/mpz/t-gcd.c (main): Omit tests with urandomb operands.
+       * tests/mpn/t-hgcd.c (main): Likewise.
+
+2012-02-05  Niels M�ller  <nisse@xxxxxxxxxxxxxx>
+
+       * tests/mpz/t-gcd.c (main): Add tests with rrandomb operands.
+       * tests/mpn/t-hgcd.c (main): Likewise.
+
+       * mpn/generic/gcdext_subdiv_step.c (mpn_gcdext_subdiv_step):
+       Bugfix, in u1 += q * u0, handle carry in all cases. Also normalize
+       the product q * u0.
+
+2012-02-04 Marco Bodrato <bodrato@xxxxxxxxxxxxxxxx>
+
+       * tests/refmpn.c (refmpn_mul): More conservative allocations.
+
+2012-02-03  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/x86_64/bd1/gmp-mparam.h: New file.
+
+       * longlong.h (udiv_qrnnd from sdiv_qrnnd): Declare udiv_w_sdiv.
+
+       * mpn/generic/udiv_w_sdiv.c: Use c89 function header.
+
+2012-02-02 Marco Bodrato <bodrato@xxxxxxxxxxxxxxxx>
+
+       * mpn/generic/toom_interpolate_16pts.c: Correct an unlikely 32-bit bug.
+
+2012-02-02  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/generic/toom63_mul.c: Allow s+t==n by adjusting an ASSERT.
+       * mpn/generic/toom_interpolate_8pts.c: Perform final incr iff s+t!=n.
+
+       * tests/mpn/t-toom6h.c (MIN_BN): Make more consistent with ASSERT in
+       tested function.
+
+2012-02-01  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * tests/mpn/t-mul.c: New file.
+       * tests/mpn/Makefile.am: Compile it.
+
+2012-01-31  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/generic/powm_sec.c (SQR_BASECASE_LIM): New name for
+       SQR_BASECASE_MAX.
+       (SQR_BASECASE_LIM, fat variant): Define to read __gmpn_cpuvec.
+       (SQR_BASECASE_LIM, native variant): Define to SQR_TOOM2_THRESHOLD
+       straight, without arithmetic.
+       (mpn_local_sqr): Use BELOW_THRESHOLD as per Marco's suggestion.
+
+2012-01-30  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * tests/mpz/t-powm.c: Ensure all sizes are seen.
+
+2012-01-27  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * Version 5.0.3 released.
+
+       * Upgrade to libtool 2.4.2.
+
+2012-01-25  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * tune/tuneup.c: Remove unused tuneup variables.
+
+2012-01-23  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/powerpc64/mode64/p6/gmp-mparam.h: New file.
+       * mpn/powerpc64/mode64/p7/gmp-mparam.h: New file.
+       * mpn/x86_64/bobcat/gmp-mparam.h: New file.
+
+2012-01-18  Marc Glisse  <marc.glisse@xxxxxxxx>
+
+       * doc/gmp.texi (mpf_class::mpf_class): Use mp_bitcnt_t.
+
+2012-01-17  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * gmp-h.in (__GNU_MP_VERSION_PATCHLEVEL): Bump.
+
+       * Makefile.am (LIBGMP_LT_*, LIBGMPXX_LT_*, LIBMP_LT_*):
+       Bump version info.
+
+       * configure.in: Add ultrasparc T4 support.
+
+       * demos/isprime.c (main): Run 25 millerrabin tests.
+
+2012-01-15  Niels M�ller  <nisse@xxxxxxxxxxxxxx>
+
+       * mpz/scan0.c (mpz_scan0): Use ~(mp_bitcnt_t) 0, rather than
+       ULONG_MAX, when returning "infinity".
+       * mpz/scan1.c (mpz_scan1): Likewise.
+
+2011-12-30  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpz/hamdist.c: Fix typo in a return statement.
+
+2011-12-08  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/generic/powm_sec.c: Handle fat binaries better.
+
+2011-12-07  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * configure.in: Fix typo making HAVE_NATIVE_mpn_X fail for fat
+       functions.
+
+       * mpn/x86_64/fat/fat.c (__gmpn_cpuvec_init): Add a missing break.
+
+2011-12-01  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/x86_64/fat/fat.c: Copy fake cpuid code from x86/fat/fat.c.
+
+       * gmp-impl.h (DECL_divexact_1): Fix typo in return type.
+
+2011-11-28  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/generic/udiv_w_sdiv.c: Use CNST_LIMB for some constants.
+
+2011-11-25  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * configure.in: Overhaul x86/x86_64 support, merging three case
+       statements into one.
+
+2011-11-24  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * doc/gmp.texi (Formatted Output Strings): Clarify rules for mpf_t
+       precision.
+
+2011-11-21  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * gmp-h.in (__GNU_MP_RELEASE): Renamed from typo name.
+
+2011-11-20  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * configure.in: Split x86 CPUs into more subtypes for more accurate
+       passing of gcc flags.
+
+       * configure.in: Pass -m32 for powerpc64 with abi=32, using via _maybe
+       mechanism.
+
+2011-11-15  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/generic/powm_sec.c (mpn_local_sqr): Remove forgotten TMP_* calls.
+       (redcify): Likewise.
+       (mpn_powm_sec): Likewise.
+
+       * mpn/generic/powm_sec.c (mpn_powm_sec): Use mpn_tabselect also in
+       initialisation.
+
+2011-10-15  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * configure.in (s390): Rewrite support to handle known CPUs.
+       * config.guess: Recognise s390 CPUs.
+       * config.sub: Match s390 CPUs.
+       * acinclude.m4 (S390_PATTERN, S390X_PATTERN): New defines.
+
+2011-10-14  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       From Per Olofsson:
+       * mpn/generic/popham.c: Add __GMP_NOTHROW to make it match gmp.h.
+
+       * configure.in: AC_DEFINE HAVE_HOST_CPU_s390_zarch.
+       * longlong.h (s390): Use it.
+       (s390 umul_ppmm): Fix typo in pure C variant.
+
+2011-10-13  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * longlong.h (s390): Put back an accidentally deleted #else.
+
+       * configure.in (s390): Unset extra_functions for s390x.
+
+2011-10-12  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * longlong.h (s390 umul_ppmm): With new-enough gcc, avoid asm.
+
+       From Andreas Krebbel:
+       * longlong.h (s390 umul_ppmm): Support 32-bit limbs with gcc using
+       64-bit registers.
+       (s390 udiv_qrnnd): Likewise.
+
+2011-10-11  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * configure.in (s390x): Pass -mzarch to gcc in 32-bit mode.
+
+       * longlong.h (s390x): Add __CLOBBER_CC for relevant asm patterns.
+
+2011-10-10  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       From Marco Trudel:
+       * tests/mpz/t-scan.c (check_ref): Fix loop end bound.
+
+2011-10-09  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * longlong.h (s390x): Put back UDItype casts to make gcc reloading use
+       right more for constants.
+       (s390x count_leading_zeros): Disable until we support z10 specifically.
+       (s390x add_ssaaaa): Remove algsi/slgsi until we support z10.
+
+2011-10-07  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * longlong.h (s390): Add 32-bit zarch umul_ppmm and udiv_qrnnd.
+       (s390): Overhaul 32-bit and 64-bit code.
+
+2011-10-04  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/Makefile.am (TARG_DIST): Add s390_32 and s390_64, remove s390.
+
+       * doc/gmp.texi (Custom Allocation): Rephrase a paragraph.
+
+       * demos/factorize.c: Run 25 Miller-Rabin tests.
+
+       * mpz/nextprime.c: Run 25 mpz_millerrabin tests (was 10).
+
+2011-10-03  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * configure.in: Support s390x.
+
+       * longlong.h: Add support for 64-bit s390x.
+
+       * mpn/s390_64: New directory.
+       * mpn/s390_32: Directory renamed from mpn/s390.
+
+2011-09-26  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/sh/sh2/submul_1.s: Make this old submul_1 implementation
+       actually compute intended function.
+
+2011-09-25  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/sh: Migrate files to '.asm'.
+       * configure.in: Recognise sh3 and sh4.
+
+2011-08-18  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * printf/doprntf.c (__gmp_doprnt_mpf): For DOPRNT_CONV_FIXED, ask for
+       one more digit.
+
+2011-08-17  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpf/sub.c: Fix typo in copy condition.  Delay an allocation.
+
+2011-08-10  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * tests/rand/t-lc2exp.c (check_bigc): Call abort after reporting error.
+
+2011-07-15  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/arm/invert_limb.asm: Swap around some registers to silence 'as'
+       warnings.
+
+2011-07-14  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/generic/dcpi1_bdiv_q.c (mpn_dcpi1_bdiv_q): Get mpn_sub_1 size
+       argument right.
+
+2011-07-04  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * tests/misc/t-locale.c: Disable test for mingw.
+
+       * configure.in (x86_64 *-*-mingw*): Handle also cygwin here; clear out
+       extra_functions_64.
+
+2011-07-02  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * config.guess: Don't print newline in x86 cpuid function.
+       Rewrite x86-64 cpu recognition asm code to work under Windoze.
+
+2011-06-16  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * acinclude.m4 (GMP_ASM_RODATA): Fix typo in 2011-04-10 change.
+
+       * configure.in: Surround tr ranges with [] for portability.
+
+2011-05-08  Marc Glisse  <marc.glisse@xxxxxxxx>
+
+       * doc/gmp.texi (gmp_randclass::get_f): Replace unsigned long
+       with mp_bitcnt_t.
+
+2011-05-07  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * Version 5.0.2 released.
+
+       * gmp-h.in (__GNU_MP_VERSION_PATCHLEVEL): Bump.
+
+       * Makefile.am (LIBGMP_LT_*, LIBGMPXX_LT_*, LIBMP_LT_*):
+       Bump version info.
+
+2011-05-05  Marc Glisse  <marc.glisse@xxxxxxxx>
+
+       [These changes were made after the 5.0.2 release, but inserted here to
+       match the change chronology of the main repository.]
+
+       * mpn/x86_64/fat/fat.c: Update for Sandy Bridge.
+       * config.guess: warning to keep it in sync with fat.c.
+
+2011-05-05  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/x86_64/fat/fat_entry.asm: (PIC_OR_DARWIN): New symbol.  Use it to
+       work around Darwin problems.
+
+2011-05-02  Marc Glisse  <marc.glisse@xxxxxxxx>
+
+       * configfsf.guess: Update to version of 2011-02-02.
+       * configfsf.sub: Update to version of 2011-03-23.
+
+2011-04-30  Marc Glisse  <marc.glisse@xxxxxxxx>
+
+       * gmp-h.in (mpz_cdiv_q_2exp): Use mp_bitcnt_t to match the definition
+       and the documentation.
+       (mpz_remove): Likewise.
+       (mpf_eq): Likewise.
+
+       * ltmain.sh: Remove.
+       * .bootstrap: Let libtoolize generate ltmain.sh.
+
+       * doc/gmp.texi (mpf_urandomb): Explicit the fact that it does not
+       change the precision.
+
+2011-04-28  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       [This change was made after the 5.0.2 release, but inserted here to
+       match the change chronology of the main repository.]
+
+       * configure.in (x86_64): Support bobcat specifically.
+       (x86): Match bobcat and bulldozer, handle like k10.
+
+2011-04-27  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * tune/speed.h (speed_cyclecounter): Always use PIC variant when
+       compiled with Apple's GCC.
+
+2011-04-26  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/sparc32/sparc-defs.m4 (changecom): Don't redefine '!' as it
+       interferes with expressions.
+
+2011-04-10  Niels M�ller  <nisse@xxxxxxxxxxxxxx>
+
+       [This change was made after the 5.0.2 release, but inserted here to
+       match the change chronology of the main repository.]
+
+       * configure.in: Add invert_limb_table to extra_functions_64 on
+       x86_64.
+
+2011-04-10  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * acinclude.m4 (GMP_ASM_RODATA): Make 'foo' larger to avoid clang
+       problems.
+
+2011-03-28  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/x86/invert_limb.asm: Protect movzwl register parameters from
+       being interpreted as m4 macro parameters.
+
+2011-03-21  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * configure.in (hppa): Under linux, treat 64-bit processors as if they
+       were 32-bit processors.
+
+2011-03-15 Marco Bodrato <bodrato@xxxxxxxxxxxxxxxx>
+
+       * mpn/generic/toom_interpolate_16pts.c: Remove ambiguity.
+
+2011-03-12  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * tune/powerpc.asm: Use powerpc syntax, not power syntax.
+
+2011-03-09  Marc Glisse  <marc.glisse@xxxxxxxx>
+
+       * doc/gmp.texi: Remove void return type from constructors. Document
+       explicit constructors. Document mpf_class::mpf_class(mpf_t).
+
+2011-02-24  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/x86/p6/sse2/mod_1_4.asm: Fix typo in MULFUNC_PROLOGUE.
+
+2011-02-04  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/x86_64/core2/popcount.asm: Add a MULFUNC_PROLOGUE.
+       * mpn/x86_64/pentium4/popcount.asm: Likewise.
+
+2011-01-31  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       [These changes were made after the 5.0.2 release, but inserted here to
+       match the change chronology of the main repository.]
+
+       * config.guess: Recognise new Intel processors.
+
+       * config.guess: Support 'coreinhm' and 'coreisbr'.
+       * config.sub: Likewise.
+       * configure.in: Likewise.
+
+2011-01-25 Marco Bodrato <bodrato@xxxxxxxxxxxxxxxx>
+
+       * mpz/mul.c: Remove redundant size computation.
+
+2010-11-11  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/x86_64/atom/aors_n.asm: Don't rely on ZF after 'bt' insn.
+       Use 64-bit 'test' to support operands of 2^32 limbs and more.
+
+2010-11-10  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       [These changes were made after the 5.0.2 release, but inserted here to
+       match the change chronology of the main repository.]
+
+       * mp_get_fns.c: Add a __GMP_NOTHROW for coherency with prototype.
+       * mp_set_fns.c: Likewise.
+       * mpf/cmp.c: Likewise.
+       * mpf/cmp_si.c: Likewise.
+       * mpf/cmp_ui.c: Likewise.
+       * mpf/fits_s.h: Likewise.
+       * mpf/fits_u.h: Likewise.
+       * mpf/get_dfl_prec.c: Likewise.
+       * mpf/get_prc.c: Likewise.
+       * mpf/get_si.c: Likewise.
+       * mpf/get_ui.c: Likewise.
+       * mpf/int_p.c: Likewise.
+       * mpf/set_dfl_prec.c: Likewise.
+       * mpf/set_prc_raw.c: Likewise.
+       * mpf/size.c: Likewise.
+       * mpf/swap.c: Likewise.
+       * mpq/equal.c: Likewise.
+       * mpq/swap.c: Likewise.
+       * mpz/cmp.c: Likewise.
+       * mpz/cmp_si.c: Likewise.
+       * mpz/cmp_ui.c: Likewise.
+       * mpz/cmpabs.c: Likewise.
+       * mpz/cmpabs_ui.c: Likewise.
+       * mpz/cong_2exp.c: Likewise.
+       * mpz/divis_2exp.c: Likewise.
+       * mpz/fits_s.h: Likewise.
+       * mpz/get_si.c: Likewise.
+       * mpz/hamdist.c: Likewise.
+       * mpz/scan0.c: Likewise.
+       * mpz/scan1.c: Likewise.
+       * mpz/sizeinbase.c: Likewise.
+       * mpz/swap.c: Likewise.
+       * mpz/tstbit.c: Likewise.
+
+2010-11-09  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       [This change was made after the 5.0.2 release, but inserted here to
+       match the change chronology of the main repository.]
+
+       * configure.in (AC_INIT): Amend bug reporting address with manual
+       reference.
+
+2010-11-06  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/x86_64/aors_n.asm: Rewrite not to rely on ZF after 'bt' insn.
+
+2010-10-04  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/x86_64/gcd_1.asm: Use m4_lshift to avoid << operator.
+       * mpn/x86/k7/gcd_1.asm: Likewise.
+
+2010-08-20  Niels M�ller  <nisse@xxxxxxxxxxxxxx>
+
+       Suggested by Ozkan Sezer:
+       * configure.in: If $M4 is already set in the environment, don't
+       touch it. Fixed the case that no assembler files are used, and
+       GMP_PROG_M4 is omitted.
+
+2010-06-15  Niels M�ller  <nisse@xxxxxxxxxxxxxx>
+
+       * tests/mpn/Makefile.am (check_PROGRAMS): Added t-mod_1.
+       * tests/mpn/t-mod_1.c: New file.
+
+2010-05-24  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/generic/mu_div_qr.c (mpn_preinv_mu_div_qr_itch): New function.
+       * gmp-impl.h: Declare it.
+       * tune/common.c (speed_mpn_mupi_div_qr): Use new itch function.
+       * tune/speed.h (SPEED_ROUTINE_MPN_MUPI_DIV_QR): Pass parameters right
+       for new itch function.
+
+2010-05-14  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/generic/redc_2.c: Use asm code just for GNU C.
+
+2010-05-06  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       [This change was made after the 5.0.2 release, but inserted here to
+       match the change chronology of the main repository.]
+
+       * tune/tuneup.c (tune_mod_1): Fix typo.
+
+2010-05-05  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       [These changes were made after the 5.0.2 release, but inserted here to
+       match the change chronology of the main repository.]
+
+       * longlong.h: Undo 2009-03-01 change for powerpc64, it gives poor code.
+
+       * tune/tuneup.c (tune_mod_1): Use more typical divisor, for the benefit
+       of machines with early-out multipliers.
+
+2010-05-04  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       [This change was made after the 5.0.2 release, but inserted here to
+       match the change chronology of the main repository.]
+
+       * tune/tuneup.c (tune_mod_1): Fix typo.
+
+2010-05-03  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       [This change was made after the 5.0.2 release, but inserted here to
+       match the change chronology of the main repository.]
+
+       * tune/tuneup.c (tune_mod_1): Measure MOD_1_1_TO_MOD_1_2_THRESHOLD and
+       MOD_1_2_TO_MOD_1_4_THRESHOLD before MOD_1U_TO_MOD_1_1_THRESHOLD for
+       correctness.
+
+2010-04-12  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * tests/mpn/t-toom6h.c (SIZE_LOG): Define.
+       * tests/mpn/t-toom8h.c (SIZE_LOG): Likewise.
+
+2010-04-10  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/x86/divrem_2.asm: Use "orb" instead of "or" to work around
+       Solaris assembler bug.
+       * mpn/x86_64/mpn/x86_64/divrem_2.asm: Likewise.
+
+2010-03-25  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/generic/toom33_mul.c: Fix mpn_add_n_sub_n usage.
+       * mpn/generic/toom3_sqr.c: Likewise.
+       * mpn/generic/toom63_mul.c: Likewise.
+
+2010-03-19  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/generic/toom_interpolate_6pts.c: Call mpn_sublsh2_n and
+       mpn_sublsh_n with correct args.
+
+2010-03-06  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * tests/tests.h (TESTS_REPS): Fix typo.
+
+2010-02-26  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/pa64/aors_n.asm: Fix typo in last change.
+
+2010-02-25  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * tests/mpz/t-perfpow.c (check_random): Use mp_limb_t type for limb
+       variables.
+
+       * tests/mpn/t-div.c: Cast a switch index to placate HP's cc.
+       * tests/mpn/t-bdiv.c: Likewise.
+
+       * mpn/pa64/aors_n.asm: Fix support of the 2.0n ABI.
+
+2010-02-23  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * mpn/generic/mod_1_3.c: Cast a switch index.
+
+       * mpn/generic/sqrtrem.c: Use CNST_LIMB.
+
+2010-02-07  Torbjorn Granlund  <tege@xxxxxxxxxx>
+
+       * tune/tuneup.c (tune_redc): Set min_size and min_is_always when
+       measuring REDC_1_TO_REDC_2_THRESHOLD.
+       (tune_mod_1): Set min_size for PREINV_MOD_1_TO_MOD_1_THRESHOLD.
+
+       * mpn/x86_64/aorrlsh_n.asm (cnt): Fix a typo.
+       * mpn/x86_64/lshsub_n.asm: Likewise.
+
 2010-02-05  Torbjorn Granlund  <tege@xxxxxxxxxx>
 
        * Version 5.0.1 released.
@@ -3662,7 +4324,6 @@
        usable for local symbols.
        (LEA): Replace with code for external references.
 
-
        * mpn/powerpc32/vmx/mod_34lsub1.asm: Use LEAL.
 
 2007-10-07  Torbjorn Granlund  <tege@xxxxxxxx>
diff --git a/gcc/gmp/INSTALL b/gcc/gmp/INSTALL
index 53427ab..efcfd88 100644
--- a/gcc/gmp/INSTALL
+++ b/gcc/gmp/INSTALL
@@ -27,12 +27,9 @@ along with the GNU MP Library.  If not, see 
http://www.gnu.org/licenses/.
 These instructions are only for the impatient.  Others should read the install
 instructions in gmp.info.  Use
 
-       info -f ./gmp.info
-
-or in emacs
-
-       C-u C-h i gmp.info
+       info -f doc/gmp.info
 
+from the gmp source directory.
 
 Here are some brief instructions on how to install GMP.  First you need to
 compile.  Since you're impatient, try this
diff --git a/gcc/gmp/Makefile.am b/gcc/gmp/Makefile.am
index 71aba66..37f4cc6 100644
--- a/gcc/gmp/Makefile.am
+++ b/gcc/gmp/Makefile.am
@@ -67,6 +67,10 @@ AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies ansi2knr
 #        4.3.2    8:2:5    5:2:1   4:16:1
 #        5.0.0    9:0:6    6:0:2   4:20:1      Should have been 10:0:0
 #        5.0.1   10:1:0    6:1:2   4:21:1
+#        5.0.2   10:2:0    6:2:2   4:22:1
+#        5.0.3   10:3:0    6:3:2   4:23:1
+#        5.0.4   10:4:0    6:4:2   4:24:1
+#        5.0.5   10:5:0    6:5:2   4:25:1
 #
 # Starting at 3:0:0 is a slight abuse of the versioning system, but it
 # ensures we're past soname libgmp.so.2, which was used on Debian GNU/Linux
@@ -80,15 +84,15 @@ AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies ansi2knr
 # libgmpxx.so.3.0.4) incrementing, to make it clear which GMP it's from.
 
 LIBGMP_LT_CURRENT =  10
-LIBGMP_LT_REVISION = 1
+LIBGMP_LT_REVISION = 5
 LIBGMP_LT_AGE =      0
 
 LIBGMPXX_LT_CURRENT =  6
-LIBGMPXX_LT_REVISION = 1
+LIBGMPXX_LT_REVISION = 5
 LIBGMPXX_LT_AGE =      2
 
 LIBMP_LT_CURRENT =  4
-LIBMP_LT_REVISION = 21
+LIBMP_LT_REVISION = 25
 LIBMP_LT_AGE =      1
 
 
diff --git a/gcc/gmp/Makefile.in b/gcc/gmp/Makefile.in
index d97ed43..7728bf1 100644
--- a/gcc/gmp/Makefile.in
+++ b/gcc/gmp/Makefile.in
@@ -238,8 +238,6 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 FGREP = @FGREP@
 GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_LIMB_BITS = @GMP_LIMB_BITS@
@@ -282,6 +280,7 @@ LTLIBOBJS = @LTLIBOBJS@
 M4 = @M4@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -315,10 +314,10 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_F77 = @ac_ct_F77@
 am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@
@@ -348,7 +347,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 mpn_objects = @mpn_objects@
@@ -414,6 +412,10 @@ AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies ansi2knr
 #        4.3.2    8:2:5    5:2:1   4:16:1
 #        5.0.0    9:0:6    6:0:2   4:20:1      Should have been 10:0:0
 #        5.0.1   10:1:0    6:1:2   4:21:1
+#        5.0.2   10:2:0    6:2:2   4:22:1
+#        5.0.3   10:3:0    6:3:2   4:23:1
+#        5.0.4   10:4:0    6:4:2   4:24:1
+#        5.0.5   10:5:0    6:5:2   4:25:1
 #
 # Starting at 3:0:0 is a slight abuse of the versioning system, but it
 # ensures we're past soname libgmp.so.2, which was used on Debian GNU/Linux
@@ -426,13 +428,13 @@ AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies ansi2knr
 # it's still good to get the shared library filename (like
 # libgmpxx.so.3.0.4) incrementing, to make it clear which GMP it's from.
 LIBGMP_LT_CURRENT = 10
-LIBGMP_LT_REVISION = 1
+LIBGMP_LT_REVISION = 5
 LIBGMP_LT_AGE = 0
 LIBGMPXX_LT_CURRENT = 6
-LIBGMPXX_LT_REVISION = 1
+LIBGMPXX_LT_REVISION = 5
 LIBGMPXX_LT_AGE = 2
 LIBMP_LT_CURRENT = 4
-LIBMP_LT_REVISION = 21
+LIBMP_LT_REVISION = 25
 LIBMP_LT_AGE = 1
 SUBDIRS = tests mpn mpz mpq mpf printf scanf cxx mpbsd demos tune doc
 
diff --git a/gcc/gmp/NEWS b/gcc/gmp/NEWS
index 3989e81..b1a695c 100644
--- a/gcc/gmp/NEWS
+++ b/gcc/gmp/NEWS
@@ -1,8 +1,116 @@
 Copyright 1996, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-2009, 2010 Free Software Foundation, Inc.
+2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 
-Verbatim copying and distribution of this entire article is permitted
-in any medium, provided this notice is preserved.
+Verbatim copying and distribution of this entire article is permitted in any
+medium, provided this notice is preserved.
+
+
+Changes between GMP version 5.0.4 and 5.0.5
+
+  BUGS FIXED
+  * A bug causing AMD 11h processors to be treated like AMD 10h has been fixed.
+    The 11h processors do not correctly handle all 10h (aka K10) instructions,
+    and GMP's use of these instructions results in major miscomputations (not
+    as one would have hoped CPU traps of some 'illegal instruction' sort).
+
+  * A bug affecting recent Intel Sandy Bridge CPUs resulting in configuration
+    failures has been fixed,
+
+  SPEEDUPS
+  * None.
+
+  FEATURES
+  * A couple of tests added to the self-check suite.
+
+  MISC
+  * None.
+
+
+Changes between GMP version 5.0.3 and 5.0.4
+
+  BUGS FIXED
+  * Thresholds in mpn_powm_sec for both fat and non-fat builds are now used
+    safely, plugging a one-word buffer overrun introduced in the 5.0.3 release
+    (for non-fat) and a multi-word buffer overrun that existed since 5.0 (for
+    fat).  (We have not been able to provoke malign stack smashing in any of
+    the ~100 configurations explored by the GMP nightly builds, but the bug
+    should be assumed to be exploitable.)
+
+  * Two bugs in multiplication code causing incorrect computation with
+    extremely low probability have been fixed.
+
+  * A bug in the test suite causing buffer overruns during "make check",
+    sometimes leading to subsequent malloc crashes, has been fixed.
+
+  * Two bugs in the gcd code have been fixed.  They could lead to incorrect
+    results, but for uniformly distributed random operands, the likelihood for
+    that is infinitesimally small.  (There was also a third bug, but that was
+    an incorrect ASSERT, which furthermore was not enabled by default.)
+
+  * A bug affecting 32-bit PowerPC division has been fixed.  The bug caused
+    miscomputation for certain divisors in the range 2^32 ... 2^64-1 (about 1
+    in 2^30 of these).
+
+  SPEEDUPS
+  * None, except indirectly through recognition of new CPUs, and through better
+    tuning parameters.
+
+  FEATURES
+  * Some more tests added to the self-check suite.
+
+  * The AMD "Bulldozer" CPU is now recognised.
+
+  MISC
+  * None.
+
+
+Changes between GMP version 5.0.2 and 5.0.3
+
+  BUGS FIXED
+  * A few minor bugs related to portability fixed.
+
+  * A slight timing leak of the powm_sec functions have been sealed.  (This
+    leak could possibly be used to extract the most significant few bits of the
+    exponent.  "Few" here means at most 10.)
+
+  * The mpz_nextprime function now runs a safer number of pseudo-random prime
+    tests.
+
+  * A bug in division code possibly causing incorrect computation was fixed.
+
+  SPEEDUPS
+  * None, except indirectly through recognition of new CPUs, and through better
+    tuning parameters.
+
+  FEATURES
+  * New CPUs recognised.
+
+  * IBM S/390 are now supported in both 31/32-bit and 64-bit mode.  (We have
+    not been able to fully test this on any multilib machine, since IBM expired
+    our guest account a few days before our release.)
+
+  MISC
+  * None.
+
+
+Changes between GMP version 5.0.1 and 5.0.2
+
+  BUGS FIXED
+  * Many minor bugs related to portability fixed.
+
+  * The support for HPPA 2.0N now works, after an assembly bug fix.
+
+  * A test case type error has been fixed.  The symptom of this bug was
+    spurious 'make check' failures.
+
+  SPEEDUPS
+  * None, except indirectly through recognition of new CPUs.
+
+  FEATURES
+  * Fat builds are now supported for 64-bit x86 processors also under Darwin.
+
+  MISC
+  * None.
 
 
 Changes between GMP version 5.0.0 and 5.0.1
@@ -14,31 +122,29 @@ Changes between GMP version 5.0.0 and 5.0.1
     selection tables' sentinel was smaller than multiplied operands.
 
   * The solib numbers now reflect the removal of the documented but preliminary
-    mpn_bdivmod function; we correctly flag incompatibility with GMP 4.3.
-    GMP 5.0.0 has this wrong, and should perhaps be uninstalled to avoid
-    confusion.
+    mpn_bdivmod function; we correctly flag incompatibility with GMP 4.3.  GMP
+    5.0.0 has this wrong, and should perhaps be uninstalled to avoid confusion.
 
   SPEEDUPS
-  * Multiplicaton of large numbers has indirectly been sped up through
-    better FFT tuning and processor recognition.  Since many operations
-    depend on multiplication, there will be a general speedup.
+  * Multiplication of large numbers has indirectly been sped up through better
+    FFT tuning and processor recognition.  Since many operations depend on
+    multiplication, there will be a general speedup.
 
   FEATURES
   * More Core i3, i5 an Core i7 processor models are recognised.
 
-  * Fixes and workarounds for Mac OS quirks should make this GMP version
-    build using many of the different versions of "Xcode".
+  * Fixes and workarounds for Mac OS quirks should make this GMP version build
+    using many of the different versions of "Xcode".
 
   MISC
-  * The amount of scratch memory needed for multiplication of huge numbers
-    have been reduced substantially (but is still larger than in GMP 4.3.)
+  * The amount of scratch memory needed for multiplication of huge numbers has
+    been reduced substantially (but is still larger than in GMP 4.3.)
 
-  * Likewise, the amount of scratch memory needed for division of large
-    numbers have been reduced substantially.
+  * Likewise, the amount of scratch memory needed for division of large numbers
+    has been reduced substantially.
 
-  * The FFT tuning code of tune/tuneup.c has been completely rewritten,
-    and new, large FFT parameter selection tables are provided for many
-    machines.
+  * The FFT tuning code of tune/tuneup.c has been completely rewritten, and
+    new, large FFT parameter selection tables are provided for many machines.
 
   * Upgraded to the latest autoconf, automake, libtool.
 
diff --git a/gcc/gmp/acinclude.m4 b/gcc/gmp/acinclude.m4
index da1b327..dfb270f 100644
--- a/gcc/gmp/acinclude.m4
+++ b/gcc/gmp/acinclude.m4
@@ -1,8 +1,8 @@
 dnl  GMP specific autoconf macros
 
 
-dnl  Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 Free Software
-dnl  Foundation, Inc.
+dnl  Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2011 Free
+dnl  Software Foundation, Inc.
 dnl
 dnl  This file is part of the GNU MP Library.
 dnl
@@ -43,11 +43,17 @@ define(M68K_PATTERN,
 define(POWERPC64_PATTERN,
 [[powerpc64-*-* | powerpc64le-*-* | powerpc620-*-* | powerpc630-*-* | 
powerpc970-*-* | power[3-9]-*-*]])
 
+define(S390_PATTERN,
+[[s390-*-* | z900esa-*-* | z990esa-*-* | z9esa-*-* | z10esa-*-* | 
z196esa-*-*]])
+
+define(S390X_PATTERN,
+[[s390x-*-* | z900-*-* | z990-*-* | z9-*-* | z10-*-* | z196-*-*]])
+
 define(X86_PATTERN,
 [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | 
geode*-*-* | atom-*-*]])
 
 define(X86_64_PATTERN,
-[[athlon64-*-* | pentium4-*-* | atom-*-* | core2-*-* | corei-*-* | x86_64-*-* 
| nano-*-*]])
+[[athlon64-*-* | k8-*-* | k10-*-* | bobcat-*-* | bulldozer-*-* | pentium4-*-* 
| atom-*-* | core2-*-* | corei*-*-* | x86_64-*-* | nano-*-*]])
 
 dnl  GMP_FAT_SUFFIX(DSTVAR, DIRECTORY)
 dnl  ---------------------------------
@@ -1941,7 +1947,8 @@ X86_PATTERN | x86_64-*-*)
 esac
 
 cat >conftest.c <<EOF
-const int foo = 123;
+extern const int foo[[]];              /* Suppresses C++'s suppression of foo 
*/
+const int foo[[]] = {1,2,3};
 EOF
 echo "Test program:" >&AC_FD_CC
 cat conftest.c >&AC_FD_CC
@@ -3092,14 +3099,17 @@ dnl  -------------------
 dnl  Determine the floating point format.
 dnl
 dnl  The object file is grepped, in order to work when cross compiling.  A
-dnl  start and end sequence is included to avoid false matches, and
-dnl  allowance is made for the desired data crossing an "od -b" line
-dnl  boundary.  The test number is a small integer so it should appear
-dnl  exactly, no rounding or truncation etc.
+dnl  start and end sequence is included to avoid false matches, and allowance
+dnl  is made for the desired data crossing an "od -b" line boundary.  The test
+dnl  number is a small integer so it should appear exactly, no rounding or
+dnl  truncation etc.
 dnl
 dnl  "od -b", incidentally, is supported even by Unix V7, and the awk script
 dnl  used doesn't have functions or anything, so even an "old" awk should
 dnl  suffice.
+dnl
+dnl  The C code here declares the variable foo as extern; without that, some
+dnl  C++ compilers will not put foo in the object file.
 
 AC_DEFUN([GMP_C_DOUBLE_FORMAT],
 [AC_REQUIRE([AC_PROG_CC])
@@ -3108,11 +3118,13 @@ AC_CACHE_CHECK([format of `double' floating point],
                 gmp_cv_c_double_format,
 [gmp_cv_c_double_format=unknown
 cat >conftest.c <<\EOF
-[struct {
+[struct foo {
   char    before[8];
   double  x;
   char    after[8];
-} foo = {
+};
+extern struct foo foo;
+struct foo foo = {
   { '\001', '\043', '\105', '\147', '\211', '\253', '\315', '\357' },
   -123456789.0,
   { '\376', '\334', '\272', '\230', '\166', '\124', '\062', '\020' },
@@ -3522,7 +3534,7 @@ else
   AC_CACHE_CHECK([whether vsnprintf works],
                  gmp_cv_func_vsnprintf,
   [gmp_cv_func_vsnprintf=yes
-   for i in 'check ("hello world");' 'int n; check ("%nhello world", &n);'; do
+   for i in 'return check ("hello world");' 'int n; return check ("%nhello 
world", &n);'; do
      AC_TRY_RUN([
 #include <string.h>  /* for strcmp */
 #include <stdio.h>   /* for vsnprintf */
@@ -3556,11 +3568,11 @@ check (va_alist)
   ret = vsnprintf (buf, 4, fmt, ap);
 
   if (strcmp (buf, "hel") != 0)
-    exit (1);
+    return 1;
 
   /* allowed return values */
   if (ret != -1 && ret != 3 && ret != 11)
-    exit (2);
+    return 2;
 
   return 0;
 }
@@ -3569,7 +3581,6 @@ int
 main ()
 {
 $i
-  exit (0);
 }
 ],
       [:],
diff --git a/gcc/gmp/aclocal.m4 b/gcc/gmp/aclocal.m4
index f9ee71e..aecf1dc 100644
--- a/gcc/gmp/aclocal.m4
+++ b/gcc/gmp/aclocal.m4
@@ -22,7 +22,8 @@ To do so, use the procedure documented by the package, 
typically `autoreconf'.])
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -31,7 +32,8 @@ To do so, use the procedure documented by the package, 
typically `autoreconf'.])
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -58,7 +60,7 @@ m4_define([_LT_COPYING], [dnl
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ])
 
-# serial 56 LT_INIT
+# serial 57 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -87,6 +89,7 @@ esac
 # ------------------
 AC_DEFUN([LT_INIT],
 [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 AC_BEFORE([$0], [LT_LANG])dnl
 AC_BEFORE([$0], [LT_OUTPUT])dnl
 AC_BEFORE([$0], [LTDL_INIT])dnl
@@ -103,6 +106,8 @@ AC_REQUIRE([LTVERSION_VERSION])dnl
 AC_REQUIRE([LTOBSOLETE_VERSION])dnl
 m4_require([_LT_PROG_LTMAIN])dnl
 
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
 dnl Parse OPTIONS
 _LT_SET_OPTIONS([$0], [$1])
 
@@ -139,7 +144,7 @@ m4_defun([_LT_CC_BASENAME],
     *) break;;
   esac
 done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 ])
 
 
@@ -159,6 +164,11 @@ m4_defun([_LT_FILEUTILS_DEFAULTS],
 m4_defun([_LT_SETUP],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build 
system])dnl
+dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -181,10 +191,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix 
(normally "")])dnl
 dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
 m4_require([_LT_CMD_RELOAD])dnl
 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
 
 _LT_CONFIG_LIBTOOL_INIT([
 # See if we are running on zsh, and set the options which allow our
@@ -200,7 +213,6 @@ fi
 _LT_CHECK_OBJDIR
 
 m4_require([_LT_TAG_COMPILER])dnl
-_LT_PROG_ECHO_BACKSLASH
 
 case $host_os in
 aix3*)
@@ -214,23 +226,6 @@ aix3*)
   ;;
 esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
 # Global variables:
 ofile=libtool
 can_build_shared=yes
@@ -271,6 +266,28 @@ _LT_CONFIG_COMMANDS
 ])# _LT_SETUP
 
 
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
 # _LT_PROG_LTMAIN
 # ---------------
 # Note that this code is called both from `configure', and `config.status'
@@ -423,7 +440,7 @@ m4_define([_lt_decl_all_varnames],
 # declaration there will have the same value as in `configure'.  VARNAME
 # must have a single quote delimited value for this to work.
 m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
 
 
 # _LT_CONFIG_STATUS_DECLARATIONS
@@ -433,7 +450,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE],
 # embedded single quotes properly.  In configure, this macro expands
 # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
 #
-#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
 m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
 [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
     [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
@@ -532,12 +549,20 @@ LTCC='$LTCC'
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
 # Quote evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e 
\\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED 
\\"\\\$sed_quote_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -548,9 +573,9 @@ done
 # Double-quote double-evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e 
\\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e 
\\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e 
\\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e 
\\"\\\$delay_variable_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -558,16 +583,38 @@ for var in lt_decl_all_varnames([[ \
     esac
 done
 
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\[$]0 --fallback-echo"')dnl "
-  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 
--fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
-  ;;
-esac
-
 _LT_OUTPUT_LIBTOOL_INIT
 ])
 
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# `#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test $lt_write_fail = 0 && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
 
 # LT_OUTPUT
 # ---------
@@ -577,20 +624,11 @@ _LT_OUTPUT_LIBTOOL_INIT
 AC_DEFUN([LT_OUTPUT],
 [: ${CONFIG_LT=./config.lt}
 AC_MSG_NOTICE([creating $CONFIG_LT])
-cat >"$CONFIG_LT" <<_LTEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate a libtool stub with the current configuration.
-
-lt_cl_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_LTEOF
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
 
 cat >>"$CONFIG_LT" <<\_LTEOF
-AS_SHELL_SANITIZE
-_AS_PREPARE
-
-exec AS_MESSAGE_FD>&1
+lt_cl_silent=false
 exec AS_MESSAGE_LOG_FD>>config.log
 {
   echo
@@ -616,7 +654,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME 
])config.lt[]dnl
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -661,15 +699,13 @@ chmod +x "$CONFIG_LT"
 # appending to config.log, which fails on DOS, as config.log is still kept
 # open by configure.  Here we exec the FD to /dev/null, effectively closing
 # config.log, so it can be properly (re)opened and appended to by config.lt.
-if test "$no_create" != yes; then
-  lt_cl_success=:
-  test "$silent" = yes &&
-    lt_config_lt_args="$lt_config_lt_args --quiet"
-  exec AS_MESSAGE_LOG_FD>/dev/null
-  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-  exec AS_MESSAGE_LOG_FD>>config.log
-  $lt_cl_success || AS_EXIT(1)
-fi
+lt_cl_success=:
+test "$silent" = yes &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
 ])# LT_OUTPUT
 
 
@@ -732,15 +768,12 @@ _LT_EOF
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_XSI_SHELLFNS
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
 
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> 
"$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
+  _LT_PROG_REPLACE_SHELLFNS
 
-  mv -f "$cfgfile" "$ofile" ||
+   mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 ],
@@ -785,6 +818,7 @@ AC_DEFUN([LT_LANG],
 m4_case([$1],
   [C],                 [_LT_LANG(C)],
   [C++],               [_LT_LANG(CXX)],
+  [Go],                        [_LT_LANG(GO)],
   [Java],              [_LT_LANG(GCJ)],
   [Fortran 77],                [_LT_LANG(F77)],
   [Fortran],           [_LT_LANG(FC)],
@@ -806,6 +840,29 @@ m4_defun([_LT_LANG],
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_GO], [
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -836,6 +893,10 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
        m4_ifdef([LT_PROG_GCJ],
        [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -846,11 +907,13 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
 AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
 AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
 AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
 dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
 dnl AC_DEFUN([AC_LIBTOOL_F77], [])
 dnl AC_DEFUN([AC_LIBTOOL_FC], [])
 dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
 
 
 # _LT_TAG_COMPILER
@@ -936,7 +999,13 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
        $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
          -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-       if test -f libconftest.dylib && test ! -s conftest.err && test 
$_lt_result = 0; then
+       # If there is a non-empty error log, and "single_module"
+       # appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+         cat conftest.err >&AS_MESSAGE_LOG_FD
+       # Otherwise, if the output was created with a 0 exit code from
+       # the compiler, it worked.
+       elif test -f libconftest.dylib && test $_lt_result -eq 0; then
          lt_cv_apple_cc_single_mod=yes
        else
          cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -944,6 +1013,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
        rm -rf libconftest.dylib*
        rm -f conftest.*
       fi])
+
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
       [lt_cv_ld_exported_symbols_list=no
@@ -955,6 +1025,34 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
        [lt_cv_ld_exported_symbols_list=no])
        LDFLAGS="$save_LDFLAGS"
     ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c 
-Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c 
-Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+       cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load 
conftest >/dev/null 2>&1 ; then
+       lt_cv_ld_force_load=yes
+      else
+       cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
     case $host_os in
     rhapsody* | darwin1.[[012]])
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -982,7 +1080,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
     else
       _lt_dar_export_syms='~$NMEDIT -s 
$output_objdir/${libname}-symbols.expsym ${lib}'
     fi
-    if test "$DSYMUTIL" != ":"; then
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
@@ -992,8 +1090,8 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -1002,7 +1100,13 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_automatic, $1)=yes
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do 
test  -n \"$conv\" && new_convenience=\"$new_convenience 
${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
   _LT_TAGVAR(link_all_deplibs, $1)=yes
   _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
   case $cc_basename in
@@ -1010,7 +1114,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
+    output_verbose_link_cmd=func_echo_all
     _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o 
\$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname 
\$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle 
\$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
     _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > 
\$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib 
\$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags 
-install_name \$rpath/\$soname \$verstring 
${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -1026,203 +1130,142 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
   fi
 ])
 
-# _LT_SYS_MODULE_PATH_AIX
-# -----------------------
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
 # Links a minimal program and checks the executable
 # for the system default hardcoded library path. In most cases,
 # this is /usr/lib:/lib, but when the MPI compilers are used
 # the location of the communication and MPI libs are included too.
 # If we don't find anything, use the default library path according
 # to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
 m4_defun([_LT_SYS_MODULE_PATH_AIX],
 [m4_require([_LT_DECL_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-       /^0/ {
-           s/^0  *\(.*\)$/\1/
-           p
-       }
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e 
"$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e 
"$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+         /^0/ {
+             s/^0  *\([^ ]*\) *$/\1/
+             p
+         }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 
2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 
2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
 ])# _LT_SYS_MODULE_PATH_AIX
 
 
 # _LT_SHELL_INIT(ARG)
 # -------------------
 m4_define([_LT_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-            [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-        [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_SHELL_INIT
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
 
 
 # _LT_PROG_ECHO_BACKSLASH
 # -----------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script which will find a shell with a builtin
+# printf (which we can use as an echo command).
 m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[_LT_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
 else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-[$]*
-_LT_EOF
-  exit 0
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
 fi
 
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q 
"[$]0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-        { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-          test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-          echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-          test "X$echo_testing_string" = "X$echo_test_string"; then
-         # Cool, printf works
-         :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" 
--fallback-echo '\t') 2>/dev/null` &&
-            test "X$echo_testing_string" = 'X\t' &&
-            echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" 
--fallback-echo "$echo_test_string") 2>/dev/null` &&
-            test "X$echo_testing_string" = "X$echo_test_string"; then
-         CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-         export CONFIG_SHELL
-         SHELL="$CONFIG_SHELL"
-         export SHELL
-         ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 
2>/dev/null` &&
-            test "X$echo_testing_string" = 'X\t' &&
-            echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo 
"$echo_test_string") 2>/dev/null` &&
-            test "X$echo_testing_string" = "X$echo_test_string"; then
-         ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-        else
-         # maybe with a smaller string...
-         prev=:
-
-         for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q 
"[$]0"' 'sed 50q "[$]0"'; do
-           if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-           then
-             break
-           fi
-           prev="$cmd"
-         done
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*" 
+}
 
-         if test "$prev" != 'sed 50q "[$]0"'; then
-           echo_test_string=`eval $prev`
-           export echo_test_string
-           exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" 
${1+"[$]@"}
-         else
-           # Oops.  We lost completely, so just stick with echo.
-           ECHO=echo
-         fi
-        fi
-      fi
-    fi
-  fi
-fi
+case "$ECHO" in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
 
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    
ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
 
-AC_SUBST(lt_ECHO)
-])
 _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1],
-    [An echo program that does not interpret backslashes])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
 ])# _LT_PROG_ECHO_BACKSLASH
 
 
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[  --with-sysroot[=DIR] Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([${with_sysroot}])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and in which our libraries should be installed.])])
+
 # _LT_ENABLE_LOCK
 # ---------------
 m4_defun([_LT_ENABLE_LOCK],
@@ -1251,7 +1294,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     if test "$lt_cv_prog_gnu_ld" = yes; then
       case `/usr/bin/file conftest.$ac_objext` in
@@ -1344,14 +1387,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
          LD="${LD-ld} -64"
@@ -1369,14 +1425,47 @@ need_locks="$enable_libtool_lock"
 ])# _LT_ENABLE_LOCK
 
 
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test "$ac_status" -eq 0; then
+       # Ensure the archiver fails upon bogus file names.
+       rm -f conftest.$ac_objext libconftest.a
+       AC_TRY_EVAL([lt_ar_try])
+       if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
 # _LT_CMD_OLD_ARCHIVE
 # -------------------
 m4_defun([_LT_CMD_OLD_ARCHIVE],
-[AC_CHECK_TOOL(AR, ar, false)
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1])
+[_LT_PROG_AR
 
 AC_CHECK_TOOL(STRIP, strip, :)
 test -z "$STRIP" && STRIP=:
@@ -1395,18 +1484,27 @@ old_postuninstall_cmds=
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
 _LT_DECL([], [old_postinstall_cmds], [2])
 _LT_DECL([], [old_postuninstall_cmds], [2])
 _LT_TAGDECL([], [old_archive_cmds], [2],
     [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
 ])# _LT_CMD_OLD_ARCHIVE
 
 
@@ -1431,15 +1529,15 @@ AC_CACHE_CHECK([$1], [$2],
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; 
then
        $2=yes
@@ -1479,7 +1577,7 @@ AC_CACHE_CHECK([$1], [$2],
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          $2=yes
@@ -1542,6 +1640,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
   amigaos*)
     # On AmigaOS with pdksh, this test takes hours, literally.
     # So we just punt and use a minimum line length of 8192.
@@ -1567,6 +1670,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1606,8 +1714,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 
2>/dev/null` \
-                = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+                = "X$teststring$teststring"; } >/dev/null 2>&1 &&
              test $i != 17 # 1/2 MB should be enough
       do
         i=`expr $i + 1`
@@ -1658,7 +1766,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-[#line __oline__ "configure"
+[#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -1699,7 +1807,13 @@ else
 #  endif
 #endif
 
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || 
(__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -1708,7 +1822,11 @@ int main ()
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+         if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+       }
       /* dlclose (self); */
     }
   else
@@ -1884,16 +2002,16 @@ AC_CACHE_CHECK([if $compiler supports -c -o 
file.$ac_objext],
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 
>/dev/null; then
        _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
@@ -2052,6 +2170,7 @@ m4_require([_LT_DECL_EGREP])dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_OBJDUMP])dnl
 m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
 AC_MSG_CHECKING([dynamic linker characteristics])
 m4_if([$1],
        [], [
@@ -2060,16 +2179,23 @@ if test "$GCC" = yes; then
     darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
     *) lt_awk_arg="/^libraries:/" ;;
   esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e 
"s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e 
"s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e 
"s/$PATH_SEPARATOR/ /g"`
-  fi
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 
"s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
   # Ok, now we have the path, separated by spaces, we can step through it
   # and add multilib dir if necessary.
   lt_tmp_lt_search_path_spec=
@@ -2082,7 +2208,7 @@ if test "$GCC" = yes; then
        lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
 BEGIN {RS=" "; FS="/|\n";} {
   lt_foo="";
   lt_count=0;
@@ -2102,7 +2228,13 @@ BEGIN {RS=" "; FS="/|\n";} {
   if (lt_foo != "") { lt_freq[[lt_foo]]++; }
   if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
 }'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi])
@@ -2128,7 +2260,7 @@ need_version=unknown
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -2137,7 +2269,7 @@ aix3*)
   ;;
 
 aix[[4-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -2190,7 +2322,7 @@ amigaos*)
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do 
libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; 
test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib 
${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || 
exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do 
libname=`func_echo_all "$lib" | $SED 
'\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM 
/sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib 
${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || 
exit 1; done'
     ;;
   esac
   ;;
@@ -2202,7 +2334,7 @@ beos*)
   ;;
 
 bsdi[[45]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -2221,8 +2353,9 @@ cygwin* | mingw* | pw32* | cegcc*)
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
@@ -2243,36 +2376,83 @@ cygwin* | mingw* | pw32* | cegcc*)
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | 
$SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 
's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | 
$SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; 
then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 
's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e 
"s/$PATH_SEPARATOR/ /g"`
-      fi
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo 
${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 
's/[[.]]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do 
@echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 
's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos 
"$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix 
"$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; 
then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 
's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 
"s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo 
\$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
+    # Assume MSVC wrapper
     library_names_spec='${libname}`echo ${release} | $SED -e 
's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -2293,7 +2473,7 @@ m4_if([$1], [],[
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2301,10 +2481,6 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -2312,7 +2488,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -2330,7 +2506,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2350,12 +2526,26 @@ freebsd* | dragonfly*)
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib 
/boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -2401,12 +2591,14 @@ hpux9* | hpux10* | hpux11*)
     soname_spec='${libname}${release}${shared_ext}$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
   postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
   ;;
 
 interix[[3-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -2422,7 +2614,7 @@ irix5* | irix6* | nonstopux*)
     nonstopux*) version_type=nonstopux ;;
     *)
        if test "$lt_cv_prog_gnu_ld" = yes; then
-               version_type=linux
+               version_type=linux # correct to gnu/linux during the next big 
refactor
        else
                version_type=irix
        fi ;;
@@ -2459,9 +2651,9 @@ linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2469,16 +2661,21 @@ linux* | k*bsd*-gnu)
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+
   # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep 
"RUNPATH.*$libdir" >/dev/null],
-       [shlibpath_overrides_runpath=yes])])
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+        LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep 
"RUNPATH.*$libdir" >/dev/null],
+        [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
@@ -2487,7 +2684,7 @@ linux* | k*bsd*-gnu)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 
2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < 
/etc/ld.so.conf | $SED -e 's/#.*//;/^[  ]*hwcap[        ]/d;s/[:,      ]/ 
/g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 
2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < 
/etc/ld.so.conf | $SED -e 's/#.*//;/^[  ]*hwcap[        ]/d;s/[:,      ]/ 
/g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi

[ *** diff truncated: 184725 lines dropped *** ]


############################################################################

Revision:    btrev43057
Commit:      89a807a12696f31463087c5468cd38001ad86fd2
URL:         http://cgit.haiku-os.org/buildtools/commit/?id=89a807a
Author:      nickc <nickc@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:        Sun May 12 15:03:43 2013 UTC
Committer:   Jérôme Duval <jerome.duval@xxxxxxxxx>
Commit-Date: Sun May 12 15:57:46 2013 UTC

PR bootstrap/50461

* configure.ac (mpfr-dir): When using in-tree MPFR sources
allow for the fact that from release v3.1.0 of MPFR the source
files were moved into a src sub-directory.
* configure: Regenerate.

----------------------------------------------------------------------------


Other related posts:

  • » [haiku-commits] buildtools: btrev43057 - in gcc: mpfr mpfr/src gmp/doc mpc gmp - korli