PlaneteCasio
/
libc
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

* configure.ac (--enable-gold): Support both, both/gold and 

both/bfd to add gold to configdirs without removing ld.
        * configure: Regenerated.

        * Makefile.def: Add install-gold dependency to install-ld.
        * Makefile.in: Regenerated.
This commit is contained in:
Nick Clifton 2010-04-27 14:24:37 +00:00
parent 67435a05ad
commit 32c2e09bba
5 changed files with 98 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2010-04-27 Roland McGrath <roland@redhat.com>
H.J. Lu <hongjiu.lu@intel.com>
* configure.ac (--enable-gold): Support both, both/gold and
both/bfd to add gold to configdirs without removing ld.
* configure: Regenerated.
* Makefile.def: Add install-gold dependency to install-ld.
* Makefile.in: Regenerated.
2010-04-14 Tristan Gingold <gingold@adacore.com>
* configure.ac (alpha*-*-*vms*): Remove ld from noconfigdirs.

1
Makefile.def
View File

@ -425,6 +425,7 @@ dependencies = { module=all-ld; on=all-build-bison; };
dependencies = { module=all-ld; on=all-build-byacc; };
dependencies = { module=all-ld; on=all-build-flex; };
dependencies = { module=all-ld; on=all-intl; };
dependencies = { module=install-ld; on=install-gold; };
dependencies = { module=configure-gold; on=configure-intl; };
dependencies = { module=all-gold; on=all-libiberty; };
dependencies = { module=all-gold; on=all-intl; };

1
Makefile.in
View File

@ -58231,6 +58231,7 @@ all-stage3-ld: maybe-all-stage3-intl
all-stage4-ld: maybe-all-stage4-intl
all-stageprofile-ld: maybe-all-stageprofile-intl
all-stagefeedback-ld: maybe-all-stagefeedback-intl
install-ld: maybe-install-gold
configure-gold: maybe-configure-intl
configure-stage1-gold: maybe-configure-stage1-intl

66
configure vendored
View File

@ -1483,7 +1483,7 @@ 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-gold use gold instead of ld
--enable-gold[=ARG] build gold [ARG={both}[/{gold,ld}]]
--enable-libada build libada directory
--enable-libssp build libssp directory
--enable-build-with-cxx build with C++ compiler instead of C compiler
@ -2901,7 +2901,7 @@ host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib l
# know that we are building the simulator.
# binutils, gas and ld appear in that order because it makes sense to run
# "make check" in that particular order.
# If --enable-gold is used, "gold" will replace "ld".
# If --enable-gold is used, "gold" may replace "ld".
host_tools="texinfo byacc flex bison binutils gas ld fixincludes gcc cgen sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
# libgcj represents the runtime libraries only used by gcj.
@ -3069,6 +3069,11 @@ case ${with_newlib} in
esac
# Handle --enable-gold.
# --enable-gold Build only gold
# --disable-gold [default] Build only ld
# --enable-gold=both Build both gold and ld, ld is default
# --enable-gold=both/ld Same
# --enable-gold=both/gold Build both gold and ld, gold is default, ld is renamed ld.bfd
# Check whether --enable-gold was given.
if test "${enable_gold+set}" = set; then :
@ -3077,32 +3082,47 @@ else
ENABLE_GOLD=no
fi
if test "${ENABLE_GOLD}" = "yes"; then
# Check for ELF target.
is_elf=no
case "${target}" in
*-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \
| *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \
| *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-solaris2* | *-*-nto*)
case "${ENABLE_GOLD}" in
yes|both|both/gold|both/ld)
# Check for ELF target.
is_elf=no
case "${target}" in
*-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \
| *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \
| *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-solaris2* | *-*-nto*)
case "${target}" in
*-*-linux*aout* | *-*-linux*oldld*)
;;
*)
is_elf=yes
;;
esac
esac
if test "$is_elf" = "yes"; then
# Check for target supported by gold.
case "${target}" in
*-*-linux*aout* | *-*-linux*oldld*)
;;
*)
is_elf=yes
i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-* | arm*-*-*)
case "${ENABLE_GOLD}" in
both*)
configdirs="$configdirs gold"
;;
*)
configdirs="`echo " ${configdirs} " | sed -e 's/ ld / gold /'`"
;;
esac
ENABLE_GOLD=yes
;;
esac
fi
;;
no)
;;
*)
as_fn_error "invalid --enable-gold argument" "$LINENO" 5
;;
esac
if test "$is_elf" = "yes"; then
# Check for target supported by gold.
case "${target}" in
i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-* | arm*-*-*)
configdirs="`echo " ${configdirs} " | sed -e 's/ ld / gold /'`"
;;
esac
fi
fi
# Configure extra directories which are host specific
case "${host}" in

66
configure.ac
View File

@ -174,7 +174,7 @@ host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib l
# know that we are building the simulator.
# binutils, gas and ld appear in that order because it makes sense to run
# "make check" in that particular order.
# If --enable-gold is used, "gold" will replace "ld".
# If --enable-gold is used, "gold" may replace "ld".
host_tools="texinfo byacc flex bison binutils gas ld fixincludes gcc cgen sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
# libgcj represents the runtime libraries only used by gcj.
@ -315,37 +315,57 @@ case ${with_newlib} in
esac
# Handle --enable-gold.
# --enable-gold Build only gold
# --disable-gold [default] Build only ld
# --enable-gold=both Build both gold and ld, ld is default
# --enable-gold=both/ld Same
# --enable-gold=both/gold Build both gold and ld, gold is default, ld is renamed ld.bfd
AC_ARG_ENABLE(gold,
[ --enable-gold use gold instead of ld],
[[ --enable-gold[=ARG] build gold [ARG={both}[/{gold,ld}]]]],
ENABLE_GOLD=$enableval,
ENABLE_GOLD=no)
if test "${ENABLE_GOLD}" = "yes"; then
# Check for ELF target.
is_elf=no
case "${target}" in
*-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \
| *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \
| *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-solaris2* | *-*-nto*)
case "${ENABLE_GOLD}" in
yes|both|both/gold|both/ld)
# Check for ELF target.
is_elf=no
case "${target}" in
*-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \
| *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \
| *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-solaris2* | *-*-nto*)
case "${target}" in
*-*-linux*aout* | *-*-linux*oldld*)
;;
*)
is_elf=yes
;;
esac
esac
if test "$is_elf" = "yes"; then
# Check for target supported by gold.
case "${target}" in
*-*-linux*aout* | *-*-linux*oldld*)
;;
*)
is_elf=yes
i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-* | arm*-*-*)
case "${ENABLE_GOLD}" in
both*)
configdirs="$configdirs gold"
;;
*)
configdirs="`echo " ${configdirs} " | sed -e 's/ ld / gold /'`"
;;
esac
ENABLE_GOLD=yes
;;
esac
fi
;;
no)
;;
*)
AC_MSG_ERROR([invalid --enable-gold argument])
;;
esac
if test "$is_elf" = "yes"; then
# Check for target supported by gold.
case "${target}" in
i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-* | arm*-*-*)
configdirs="`echo " ${configdirs} " | sed -e 's/ ld / gold /'`"
;;
esac
fi
fi
# Configure extra directories which are host specific
case "${host}" in