Backport from trunk:

2010-11-23  H.J. Lu  <hongjiu.lu@intel.com>

	PR binutils/12258
	* configure.ac: Correct comments for --enable-gold/--enable-ld.
	Properly check default linker.
	* configure: Regnerated.

diff --git a/ChangeLog b/ChangeLog
index b69d56228850f6250c2bcfc5c22bff953fcecde3..8b38454813c61a3f3bda9b3ca5f370c1e9c32df5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR binutils/12258
+       * configure.ac: Correct comments for --enable-gold/--enable-ld.
+       Properly check default linker.
+       * configure: Regnerated.
+
 2010-11-23  Matthias Klose  <doko@ubuntu.com>
 
        * configure.ac: For --enable-gold, handle value `default' instead of

diff --git a/configure b/configure
index 64968c78035eb8d38224911e64a4778dfc68cb86..7212797be55afe789cccf94609b4a00e9e7cec67 100755 (executable)
--- a/configure
+++ b/configure
@@ -2839,13 +2839,17 @@ esac
 # Handle --enable-gold, --enable-ld.
 # --disable-gold [--enable-ld]
 #     Build only ld.  Default option.
-# --enable-gold[=default] [--enable-ld]
+# --enable-gold [--enable-ld]
+#     Build both gold and ld.  Install gold as "ld.gold", install ld
+#     as "ld.bfd" and "ld".
+# --enable-gold=default [--enable-ld]
 #     Build both gold and ld.  Install gold as "ld.gold" and "ld",
 #     install ld as "ld.bfd".
 # --enable-gold[=default] --disable-ld
 #     Build only gold, which is then installed as both "ld.gold" and "ld".
 # --enable-gold --enable-ld=default
-#     Build both gold (installed as "gold") and ld (installed as "ld").
+#     Build both gold (installed as "ld.gold") and ld (installed as "ld"
+#     and ld.bfd).
 #     In other words, ld is default
 # --enable-gold=default --enable-ld=default
 #     Error.
@@ -2905,7 +2909,7 @@ fi
 
 case "${ENABLE_LD}" in
   default)
-    if test x${default_ld} != xgold; then
+    if test x${default_ld} != x; then
       as_fn_error "either gold or ld can be the default ld" "$LINENO" 5
     fi
     ;;

diff --git a/configure.ac b/configure.ac
index d8c886c850d18cea57958c787ff9826a05b32264..19cf53f6a9ea8b76c08dc9781ed664b432b07052 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -324,13 +324,17 @@ esac
 # Handle --enable-gold, --enable-ld.
 # --disable-gold [--enable-ld]
 #     Build only ld.  Default option.
-# --enable-gold[=default] [--enable-ld]
+# --enable-gold [--enable-ld]
+#     Build both gold and ld.  Install gold as "ld.gold", install ld
+#     as "ld.bfd" and "ld".
+# --enable-gold=default [--enable-ld]
 #     Build both gold and ld.  Install gold as "ld.gold" and "ld",
 #     install ld as "ld.bfd".
 # --enable-gold[=default] --disable-ld
 #     Build only gold, which is then installed as both "ld.gold" and "ld".
 # --enable-gold --enable-ld=default
-#     Build both gold (installed as "gold") and ld (installed as "ld").
+#     Build both gold (installed as "ld.gold") and ld (installed as "ld"
+#     and ld.bfd).
 #     In other words, ld is default
 # --enable-gold=default --enable-ld=default
 #     Error.
@@ -384,7 +388,7 @@ ENABLE_LD=yes)
 
 case "${ENABLE_LD}" in
   default)
-    if test x${default_ld} != xgold; then
+    if test x${default_ld} != x; then
       AC_MSG_ERROR([either gold or ld can be the default ld])
     fi
     ;;