diff --git a/ChangeLog b/ChangeLog
index cc57c27c59aadeed0e0b1d1acc8ae94d38d7cbeb..ef3d5245bcf844d1b8a28c891f69b8c5e4752fc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-02  Ian Lance Taylor  <iant@google.com>
+
+	* configure.ac: Always set default for poststage1_ldflags to
+	-static-libstdc++ -static-libgcc.
+
 2010-11-29  Andreas Schwab  <schwab@redhat.com>
 
 	* configure.ac: Move comment to remove extra space in last argument
diff --git a/configure b/configure
index 683341345d1d59f7e024d54a6d97e999ca597a93..de6da33de974dcf77b78371cb14655c153beb775 100755
--- a/configure
+++ b/configure
@@ -5606,10 +5606,10 @@ if test "${with_boot_ldflags+set}" = set; then :
  fi
 else
   poststage1_ldflags=
- # With --enable-build-with-cxx, default to linking libstdc++ and
- # libgcc statically.  But if the user explicitly specified the
- # libraries to use, trust that they are doing what they want.
- if test "$ENABLE_BUILD_WITH_CXX" = "yes" -a "$poststage1_libs" = ""; then
+ # In stages 2 and 3, default to linking libstdc++ and libgcc
+ # statically.  But if the user explicitly specified the libraries to
+ # use, trust that they are doing what they want.
+ if test "$poststage1_libs" = ""; then
    poststage1_ldflags="-static-libstdc++ -static-libgcc"
  fi
 fi
diff --git a/configure.ac b/configure.ac
index 65c0a74cda9bbc9dc9316548dd4df12ed3f7ee87..289416f79f672d4e7de485566c2c4bbfb0af96dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1561,10 +1561,10 @@ AC_ARG_WITH(boot-ldflags,
    poststage1_ldflags=$withval
  fi],
 [poststage1_ldflags=
- # With --enable-build-with-cxx, default to linking libstdc++ and
- # libgcc statically.  But if the user explicitly specified the
- # libraries to use, trust that they are doing what they want.
- if test "$ENABLE_BUILD_WITH_CXX" = "yes" -a "$poststage1_libs" = ""; then
+ # In stages 2 and 3, default to linking libstdc++ and libgcc
+ # statically.  But if the user explicitly specified the libraries to
+ # use, trust that they are doing what they want.
+ if test "$poststage1_libs" = ""; then
    poststage1_ldflags="-static-libstdc++ -static-libgcc"
  fi])
 AC_SUBST(poststage1_ldflags)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a29b13ae71cd6794327bfa1718cb378f0e796914..ccfce94f4bedce2bda2d583c12b1ba02748b9937 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-02  Ian Lance Taylor  <iant@google.com>
+
+	* doc/install.texi (Configuration): Update default for
+	--with-boot-ldflags.
+
 2010-12-02  Nathan Froyd  <froydnj@codesourcery.com>
 
 	PR c/45062
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index e67793ac5ea9291b604af38e0937186a8399f06f..5bdd35b4c2a6362631b1edf2e8f004aec3ff3788 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -1611,8 +1611,9 @@ of GCC.  These are also used when linking GCC if configured with
 
 @item --with-boot-ldflags=@var{flags}
 This option may be used to set linker flags to be used when linking
-stage 2 and later when bootstrapping GCC.  By default no special flags
-are used.
+stage 2 and later when bootstrapping GCC.  If neither --with-boot-libs
+nor --with-host-libstdcxx is set to a value, then the default is
+@samp{-static-libstdc++ -static-libgcc}.
 
 @item --with-boot-libs=@var{libs}
 This option may be used to set libraries to be used when linking stage 2