| Index: configure | 
| diff --git a/configure b/configure | 
| index 9a0086c99c93e9efa455a52409678c5a20a2e91f..6079e6c07511e12bb51ae5197e7110d79c36b098 100755 | 
| --- a/configure | 
| +++ b/configure | 
| @@ -2869,7 +2869,7 @@ case "${ENABLE_GOLD}" in | 
| *-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \ | 
| | *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \ | 
| | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* \ | 
| -      | *-*-solaris2* | *-*-nto*) | 
| +      | *-*-solaris2* | *-*-nto* | *-*-nacl*) | 
| case "${target}" in | 
| *-*-linux*aout* | *-*-linux*oldld*) | 
| ;; | 
| @@ -3054,7 +3054,7 @@ if test x$enable_libgomp = x ; then | 
| ;; | 
| *-*-netbsd* | *-*-freebsd* | *-*-openbsd* | *-*-dragonfly*) | 
| ;; | 
| -    *-*-solaris2* | *-*-irix6* | *-*-osf* | *-*-hpux11*) | 
| +    *-*-solaris2* | *-*-hpux11*) | 
| ;; | 
| *-*-darwin* | *-*-aix*) | 
| ;; | 
| @@ -3093,7 +3093,9 @@ case "${target}" in | 
| noconfigdirs="$noconfigdirs target-libssp" | 
| ;; | 
| rl78-*-*) | 
| -    # Dereferencing -1 is a compile-time error | 
| +    # libssp uses a misaligned load to trigger a fault, but the RL78 | 
| +    # doesn't fault for those - instead, it gives a build-time error | 
| +    # for explicit misaligned loads. | 
| noconfigdirs="$noconfigdirs target-libssp" | 
| ;; | 
| esac | 
| @@ -3143,7 +3145,7 @@ case "${target}" in | 
| ;; | 
| m68k-*-*) | 
| ;; | 
| -  mips-sgi-irix6.* | mips*-*-rtems*) | 
| +  mips*-*-rtems*) | 
| ;; | 
| mips*-*-linux*) | 
| ;; | 
| @@ -3259,13 +3261,6 @@ case "${target}" in | 
| rs6000-*-aix*) | 
| noconfigdirs="$noconfigdirs ${libgcj}" | 
| ;; | 
| -  mips*-*-irix6*) | 
| -    # Linking libjava exceeds command-line length limits on at least | 
| -    # IRIX 6.2, but not on IRIX 6.5. | 
| -    # Also, boehm-gc won't build on IRIX 6.5, according to Jeffrey Oldham | 
| -    # <oldham@codesourcery.com> | 
| -    noconfigdirs="$noconfigdirs ${libgcj}" | 
| -    ;; | 
| *-*-lynxos*) | 
| noconfigdirs="$noconfigdirs ${libgcj}" | 
| ;; | 
| @@ -3503,8 +3498,7 @@ case "${target}" in | 
| noconfigdirs="$noconfigdirs libgui itcl ld" | 
| ;; | 
| ia64*-*-*vms*) | 
| -    # No gdb or ld support yet. | 
| -    noconfigdirs="$noconfigdirs readline libgui itcl gdb ld" | 
| +    noconfigdirs="$noconfigdirs libgui itcl" | 
| ;; | 
| i[3456789]86-w64-mingw*) | 
| ;; | 
| @@ -4977,7 +4971,7 @@ fi | 
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_cc_gcc_supports_ada" >&5 | 
| $as_echo "$acx_cv_cc_gcc_supports_ada" >&6; } | 
|  | 
| -if test x$GNATBIND != xno && test x$GNATMAKE != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then | 
| +if test "x$GNATBIND" != xno && test "x$GNATMAKE" != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then | 
| have_gnat=yes | 
| else | 
| have_gnat=no | 
| @@ -5195,9 +5189,16 @@ if test "x$with_mpfr_lib" != x; then | 
| gmplibs="-L$with_mpfr_lib $gmplibs" | 
| fi | 
| if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then | 
| -  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs" | 
| -  gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc" | 
| -  extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir" | 
| +  # MPFR v3.1.0 moved the sources into a src sub-directory. | 
| +  if test -d ${srcdir}/mpfr/src; then | 
| +    gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir $gmplibs" | 
| +    gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr/src -I$$s/mpfr/src '"$gmpinc" | 
| +    extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr/src --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir" | 
| +  else | 
| +    gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs" | 
| +    gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc" | 
| +    extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir" | 
| +  fi | 
| # Do not test the mpfr version.  Assume that it is sufficient, since | 
| # it is in the source tree, and the library has not been built yet | 
| # but it would be included on the link line in the version check below | 
| @@ -6666,11 +6667,11 @@ if test "x$CFLAGS_FOR_TARGET" = x; then | 
| CFLAGS_FOR_TARGET=$CFLAGS | 
| case " $CFLAGS " in | 
| *" -O2 "*) ;; | 
| -    *) CFLAGS_FOR_TARGET="-O2 $CFLAGS" ;; | 
| +    *) CFLAGS_FOR_TARGET="-O2 $CFLAGS_FOR_TARGET" ;; | 
| esac | 
| case " $CFLAGS " in | 
| *" -g "* | *" -g3 "*) ;; | 
| -    *) CFLAGS_FOR_TARGET="-g $CFLAGS" ;; | 
| +    *) CFLAGS_FOR_TARGET="-g $CFLAGS_FOR_TARGET" ;; | 
| esac | 
| fi | 
|  | 
| @@ -6679,11 +6680,11 @@ if test "x$CXXFLAGS_FOR_TARGET" = x; then | 
| CXXFLAGS_FOR_TARGET=$CXXFLAGS | 
| case " $CXXFLAGS " in | 
| *" -O2 "*) ;; | 
| -    *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS" ;; | 
| +    *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS_FOR_TARGET" ;; | 
| esac | 
| case " $CXXFLAGS " in | 
| *" -g "* | *" -g3 "*) ;; | 
| -    *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS" ;; | 
| +    *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS_FOR_TARGET" ;; | 
| esac | 
| fi | 
|  | 
| @@ -6873,18 +6874,6 @@ case "${enable_target_optspace}:${target}" in | 
| ;; | 
| esac | 
|  | 
| -# Default to using --with-stabs for certain targets. | 
| -if test x${with_stabs} = x ; then | 
| -  case "${target}" in | 
| -  mips*-*-irix[56]*) | 
| -    ;; | 
| -  mips*-*-* | alpha*-*-osf*) | 
| -    with_stabs=yes; | 
| -    extra_host_args="${extra_host_args} --with-stabs" | 
| -    ;; | 
| -  esac | 
| -fi | 
| - | 
| # Some systems (e.g., one of the i386-aix systems the gas testers are | 
| # using) don't handle "\$" correctly, so don't use it here. | 
| tooldir='${exec_prefix}'/${target_noncanonical} | 
|  |