aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rwxr-xr-xconfigure10
-rw-r--r--configure.ac10
3 files changed, 21 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index d1356a6..44be6df 100644
--- 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 2758ab0..8b67ba3 100755
--- a/configure
+++ b/configure
@@ -2854,13 +2854,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.
@@ -2920,7 +2924,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 626bb4e..294f241 100644
--- a/configure.ac
+++ b/configure.ac
@@ -327,13 +327,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.
@@ -387,7 +391,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
;;