135 lines
4.7 KiB
Diff
135 lines
4.7 KiB
Diff
Index: gold/configure
|
|
===================================================================
|
|
--- gold/configure.orig 2010-11-23 14:50:32.000000000 +0100
|
|
+++ gold/configure 2011-01-10 18:04:44.000000000 +0100
|
|
@@ -770,6 +770,7 @@ enable_gold
|
|
enable_threads
|
|
enable_plugins
|
|
enable_targets
|
|
+enable_ld_targets
|
|
enable_dependency_tracking
|
|
enable_nls
|
|
enable_werror
|
|
@@ -1416,6 +1417,7 @@ Optional Features:
|
|
--enable-threads multi-threaded linking
|
|
--enable-plugins linker plugins
|
|
--enable-targets alternative target configurations
|
|
+ --enable-ld-targets alternative target configurations
|
|
--disable-dependency-tracking speeds up one-time build
|
|
--enable-dependency-tracking do not reject slow dependency extractors
|
|
--disable-nls do not use Native Language Support
|
|
@@ -3354,9 +3356,29 @@ else
|
|
fi
|
|
|
|
|
|
+# Check whether --enable-ld-targets was given.
|
|
+if test "${enable_ld_targets+set}" = set; then :
|
|
+ enableval=$enable_ld_targets; case "${enableval}" in
|
|
+ yes | "")
|
|
+ as_fn_error "--enable-ld-targets option must specify target names or 'all'" "$LINENO" 5
|
|
+ ;;
|
|
+ no)
|
|
+ enable_ld_targets=
|
|
+ ;;
|
|
+ *)
|
|
+ enable_ld_targets=$enableval
|
|
+ ;;
|
|
+esac
|
|
+else
|
|
+ # For now, enable all targets by default
|
|
+ enable_ld_targets=$enable_targets
|
|
+
|
|
+fi
|
|
+
|
|
+
|
|
# Canonicalize the enabled targets.
|
|
-if test -n "$enable_targets"; then
|
|
- for targ in `echo $enable_targets | sed -e 's/,/ /g'`; do
|
|
+if test -n "$enable_ld_targets"; then
|
|
+ for targ in `echo $enable_ld_targets | sed -e 's/,/ /g'`; do
|
|
result=`$ac_config_sub $targ 2>/dev/null`
|
|
if test -n "$result"; then
|
|
canon_targets="$canon_targets $result"
|
|
Index: gold/configure.ac
|
|
===================================================================
|
|
--- gold/configure.ac.orig 2010-11-23 14:50:32.000000000 +0100
|
|
+++ gold/configure.ac 2011-01-10 18:04:44.000000000 +0100
|
|
@@ -117,9 +117,26 @@ esac],
|
|
enable_targets=all
|
|
])
|
|
|
|
+AC_ARG_ENABLE([ld-targets],
|
|
+[ --enable-ld-targets alternative target configurations],
|
|
+[case "${enableval}" in
|
|
+ yes | "")
|
|
+ AC_MSG_ERROR([--enable-ld-targets option must specify target names or 'all'])
|
|
+ ;;
|
|
+ no)
|
|
+ enable_ld_targets=
|
|
+ ;;
|
|
+ *)
|
|
+ enable_ld_targets=$enableval
|
|
+ ;;
|
|
+esac],
|
|
+[# For now, enable all targets by default
|
|
+ enable_ld_targets=$enable_targets
|
|
+])
|
|
+
|
|
# Canonicalize the enabled targets.
|
|
-if test -n "$enable_targets"; then
|
|
- for targ in `echo $enable_targets | sed -e 's/,/ /g'`; do
|
|
+if test -n "$enable_ld_targets"; then
|
|
+ for targ in `echo $enable_ld_targets | sed -e 's/,/ /g'`; do
|
|
result=`$ac_config_sub $targ 2>/dev/null`
|
|
if test -n "$result"; then
|
|
canon_targets="$canon_targets $result"
|
|
Index: ld/configure
|
|
===================================================================
|
|
--- ld/configure.orig 2010-11-23 14:50:32.000000000 +0100
|
|
+++ ld/configure 2011-01-10 18:04:44.000000000 +0100
|
|
@@ -1413,6 +1413,7 @@ Optional Features:
|
|
--enable-maintainer-mode enable make rules and dependencies not useful
|
|
(and sometimes confusing) to the casual installer
|
|
--enable-targets alternative target configurations
|
|
+ --enable-ld-targets alternative target configurations
|
|
--enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)
|
|
--enable-gold[=ARG] build gold [ARG={default,yes,no}]
|
|
--enable-got=<type> GOT handling scheme (target, single, negative,
|
|
@@ -13155,7 +13156,7 @@ all_libpath=
|
|
|
|
rm -f tdirs
|
|
|
|
-for targ_alias in `echo $target_alias $enable_targets | sed 's/,/ /g'`
|
|
+for targ_alias in `echo $target_alias $enable_ld_targets | sed 's/,/ /g'`
|
|
do
|
|
if test "$targ_alias" = "all"; then
|
|
all_targets=true
|
|
Index: ld/configure.in
|
|
===================================================================
|
|
--- ld/configure.in.orig 2010-11-23 14:50:32.000000000 +0100
|
|
+++ ld/configure.in 2011-01-10 18:04:44.000000000 +0100
|
|
@@ -22,6 +22,14 @@ AC_ARG_ENABLE(targets,
|
|
no) enable_targets= ;;
|
|
*) enable_targets=$enableval ;;
|
|
esac])dnl
|
|
+AC_ARG_ENABLE(ld-targets,
|
|
+[ --enable-ld-targets alternative target configurations],
|
|
+[case "${enableval}" in
|
|
+ yes | "") AC_ERROR(enable-ld-targets option must specify target names or 'all')
|
|
+ ;;
|
|
+ no) enable_ld_targets= ;;
|
|
+ *) enable_ld_targets=$enableval ;;
|
|
+esac], [enable_ld_targets=$enable_targets])dnl
|
|
AC_ARG_ENABLE(64-bit-bfd,
|
|
[ --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)],
|
|
[case "${enableval}" in
|
|
@@ -226,7 +234,7 @@ dnl not permit literal newlines in an AC
|
|
dnl file.
|
|
rm -f tdirs
|
|
|
|
-for targ_alias in `echo $target_alias $enable_targets | sed 's/,/ /g'`
|
|
+for targ_alias in `echo $target_alias $enable_ld_targets | sed 's/,/ /g'`
|
|
do
|
|
if test "$targ_alias" = "all"; then
|
|
all_targets=true
|