From c7c774abda26241b4bfb66a2a54de2763b49012e Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Wed, 24 Nov 2010 13:27:41 +0000 Subject: Backport from trunk: 2010-11-23 H.J. Lu PR binutils/12258 * configure.ac: Correct comments for --enable-gold/--enable-ld. Properly check default linker. * configure: Regnerated. --- ChangeLog | 7 +++++++ configure | 10 +++++++--- configure.ac | 10 +++++++--- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index b69d56228..8b3845481 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-11-23 H.J. Lu + + PR binutils/12258 + * configure.ac: Correct comments for --enable-gold/--enable-ld. + Properly check default linker. + * configure: Regnerated. + 2010-11-23 Matthias Klose * configure.ac: For --enable-gold, handle value `default' instead of diff --git a/configure b/configure index 64968c780..7212797be 100755 --- 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 d8c886c85..19cf53f6a 100644 --- 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 ;; -- cgit v1.2.3