aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2010-11-23 13:39:57 +0000
committerNick Clifton <nickc@redhat.com>2010-11-23 13:39:57 +0000
commitc77912127fd71c822df5b03a3190cddd19b1dd4f (patch)
tree41bb4118ae77e8f2b79d8b2870ecf911014a4a2a /ld
parentea976c60e229b7d4ccfbf4a735a09c407f104a20 (diff)
downloadgdb-c77912127fd71c822df5b03a3190cddd19b1dd4f.zip
gdb-c77912127fd71c822df5b03a3190cddd19b1dd4f.tar.gz
gdb-c77912127fd71c822df5b03a3190cddd19b1dd4f.tar.bz2
* configure.ac: For --enable-gold, handle value `default' instead of
`both*'. New configure option --{en,dis}able-ld. ld, gold/ * configure.ac: For --enable-gold, handle value `default' instead of `both*'. Always install ld as ld.gold, install as ld if gold is the default.
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog7
-rwxr-xr-xld/configure10
-rw-r--r--ld/configure.in10
3 files changed, 17 insertions, 10 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 562ba57..fc6a6d0 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-23 Matthias Klose <doko@ubuntu.com>
+
+ * configure.ac: For --enable-gold, handle value `default' instead of
+ `both*'. Always install ld as ld.gold, install as ld if gold is
+ the default.
+ * configure: Regenerate.
+
2010-11-21 H.J. Lu <hongjiu.lu@intel.com>
* ldfile.c: Re-indent plugin code.
diff --git a/ld/configure b/ld/configure
index 3367a88..088c721 100755
--- a/ld/configure
+++ b/ld/configure
@@ -1414,7 +1414,7 @@ Optional Features:
(and sometimes confusing) to the casual installer
--enable-targets alternative target configurations
--enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)
- --enable-gold[=ARG] build gold [ARG={both}[/{gold,ld}]]
+ --enable-gold[=ARG] build gold [ARG={default,yes,no}]
--enable-got=<type> GOT handling scheme (target, single, negative,
multigot)
--enable-werror treat compile warnings as errors
@@ -4179,11 +4179,11 @@ fi
# Check whether --enable-gold was given.
if test "${enable_gold+set}" = set; then :
enableval=$enable_gold; case "${enableval}" in
- yes|both/gold)
+ default)
install_as_default=no
installed_linker=ld.bfd
;;
- both|both/ld)
+ yes|no)
install_as_default=yes
installed_linker=ld.bfd
;;
@@ -4192,8 +4192,8 @@ if test "${enable_gold+set}" = set; then :
;;
esac
else
- install_as_default=ld
- installed_linker=ld
+ install_as_default=yes
+ installed_linker=ld.bfd
fi
diff --git a/ld/configure.in b/ld/configure.in
index 122f65e..85fe903 100644
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -73,13 +73,13 @@ dnl Use --enable-gold to decide if this linker should be the default.
dnl "install_as_default" is set to false if gold is the default linker.
dnl "installed_linker" is the installed BFD linker name.
AC_ARG_ENABLE(gold,
-[[ --enable-gold[=ARG] build gold [ARG={both}[/{gold,ld}]]]],
+[[ --enable-gold[=ARG] build gold [ARG={default,yes,no}]]],
[case "${enableval}" in
- yes|both/gold)
+ default)
install_as_default=no
installed_linker=ld.bfd
;;
- both|both/ld)
+ yes|no)
install_as_default=yes
installed_linker=ld.bfd
;;
@@ -87,8 +87,8 @@ AC_ARG_ENABLE(gold,
AC_MSG_ERROR([invalid --enable-gold argument])
;;
esac],
-[install_as_default=ld
- installed_linker=ld])
+[install_as_default=yes
+ installed_linker=ld.bfd])
AC_SUBST(install_as_default)
AC_SUBST(installed_linker)