1.1 --- a/config/binutils/binutils.in Sun Jan 02 13:52:16 2011 +0100
1.2 +++ b/config/binutils/binutils.in Mon Jan 03 23:40:22 2011 +0100
1.3 @@ -100,6 +100,7 @@
1.4 depends on BINUTILS_HAS_GOLD
1.5 depends on EXPERIMENTAL
1.6 select BINUTILS_GOLD_INSTALLED
1.7 + select BINUTILS_LINKER_BOTH
1.8 help
1.9 Both the historical ld and the new gold linkers will be
1.10 installed, with ld being the default linker used.
1.11 @@ -112,6 +113,7 @@
1.12 depends on BINUTILS_HAS_GOLD
1.13 depends on EXPERIMENTAL
1.14 select BINUTILS_GOLD_INSTALLED
1.15 + select BINUTILS_LINKER_BOTH
1.16 help
1.17 Both the historical ld and the new gold linkers will be
1.18 installed, with gold being the default linker used.
1.19 @@ -131,6 +133,9 @@
1.20 When configured with threads, gold can link in parallel,
1.21 possibly cooperating with a make jobserver.
1.22
1.23 +config BINUTILS_LINKER_BOTH
1.24 + bool
1.25 +
1.26 config BINUTILS_LINKERS_LIST
1.27 string
1.28 default "ld" if BINUTILS_LINKER_LD
1.29 @@ -138,6 +143,25 @@
1.30 default "ld,gold" if BINUTILS_LINKER_LD_GOLD
1.31 default "gold,ld" if BINUTILS_LINKER_GOLD_LD
1.32
1.33 +config BINUTILS_LD_WRAPPER
1.34 + bool
1.35 + prompt "| Add ld wrapper"
1.36 + depends on BINUTILS_LINKER_BOTH
1.37 + help
1.38 + Add an ld wrapper that calls to either gold or ld.
1.39 +
1.40 + By default, the wrapper will call to the default wrapper,
1.41 + but if you set the environment variable CTNG_LD_IS, you
1.42 + can change which linker will get called:
1.43 + CTNG_LD_IS=gold will unconditionally call the gold linker
1.44 + CTNG_LD_IS=bfd will unconditionally call the old bfd ld linker
1.45 +
1.46 +config BINUTILS_LINKER_DEFAULT
1.47 + string
1.48 + depends on BINUTILS_LD_WRAPPER
1.49 + default "bfd" if BINUTILS_LINKER_LD_GOLD
1.50 + default "gold" if BINUTILS_LINKER_GOLD_LD
1.51 +
1.52 endif # BINUTILS_HAS_GOLD
1.53
1.54 config BINUTILS_PLUGINS