diff options
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 9 | ||||
| -rwxr-xr-x | gold/configure | 28 | ||||
| -rw-r--r-- | gold/configure.ac | 26 |
3 files changed, 22 insertions, 41 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index b7876d4..47ef7e8 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,4 +1,13 @@ 2013-01-07 H.J. Lu <hongjiu.lu@intel.com> + Ian Lance Taylor <iant@google.com> + + PR gold/14897 + * configure.ac (--enable-ld): Removed. + (install_as_default): Set to yes only for --enable-gold=default + or --disable-ld. + * configure: Regenerated. + +2013-01-07 H.J. Lu <hongjiu.lu@intel.com> * options.h (General_options): Add -fuse-ld= for GCC linker option compatibility. diff --git a/gold/configure b/gold/configure index e3c0bda..9e1ee27 100755 --- a/gold/configure +++ b/gold/configure @@ -774,7 +774,6 @@ ac_subst_files='' ac_user_opts=' enable_option_checking with_sysroot -enable_ld enable_gold enable_threads enable_plugins @@ -1424,7 +1423,6 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-ld[=ARG] build ld [ARG={default,yes,no}] --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-threads multi-threaded linking --enable-plugins linker plugins @@ -3270,35 +3268,21 @@ _ACEOF -default_ld= -# Check whether --enable-ld was given. -if test "${enable_ld+set}" = set; then : - enableval=$enable_ld; case "${enableval}" in - default) - default_ld=ld.bfd - ;; -esac -fi - - +installed_linker=ld.gold # Check whether --enable-gold was given. if test "${enable_gold+set}" = set; then : enableval=$enable_gold; case "${enableval}" in - yes|default) - if test x${default_ld} = x; then + default) + install_as_default=yes + ;; + yes) + if test x${enable_ld} = xno; then install_as_default=yes fi - installed_linker=ld.gold - ;; - no) - ;; - *) - as_fn_error "invalid --enable-gold argument" "$LINENO" 5 ;; esac else install_as_default=no - installed_linker=ld.gold fi diff --git a/gold/configure.ac b/gold/configure.ac index e49d6e8..804a474 100644 --- a/gold/configure.ac +++ b/gold/configure.ac @@ -68,32 +68,20 @@ dnl "install_as_default" is true if the linker to be installed as the dnl default linker, ld. dnl "installed_linker" is the installed gold linker name. -default_ld= -AC_ARG_ENABLE(ld, -[[ --enable-ld[=ARG] build ld [ARG={default,yes,no}]]], -[case "${enableval}" in - default) - default_ld=ld.bfd - ;; -esac]) - +installed_linker=ld.gold AC_ARG_ENABLE(gold, [[ --enable-gold[=ARG] build gold [ARG={default,yes,no}]]], [case "${enableval}" in - yes|default) - if test x${default_ld} = x; then + default) + install_as_default=yes + ;; + yes) + if test x${enable_ld} = xno; then install_as_default=yes fi - installed_linker=ld.gold - ;; - no) - ;; - *) - AC_MSG_ERROR([invalid --enable-gold argument]) ;; esac], -[install_as_default=no - installed_linker=ld.gold]) +[install_as_default=no]) AC_SUBST(install_as_default) AC_SUBST(installed_linker) |