SHA256
1
0
forked from pool/binutils
binutils/enable-targets.diff

141 lines
4.8 KiB
Diff

--- gold/configure
+++ gold/configure
@@ -867,6 +867,7 @@ Optional Features:
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-threads multi-threaded linking
--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
@@ -1981,9 +1982,31 @@ else
fi;
+# Check whether --enable-ld-targets or --disable-ld-targets was given.
+if test "${enable_ld_targets+set}" = set; then
+ enableval="$enable_ld_targets"
+ case "${enableval}" in
+ yes | "")
+ { { echo "$as_me:$LINENO: error: --enable-ld-targets option must specify target names or 'all'" >&5
+echo "$as_me: error: --enable-ld-targets option must specify target names or 'all'" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ 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"
--- gold/configure.ac
+++ gold/configure.ac
@@ -70,9 +70,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"
--- ld/configure
+++ ld/configure
@@ -1003,6 +1003,7 @@ Optional Features:
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--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-got=<type> GOT handling scheme (target, single, negative,
multigot)
@@ -3283,6 +3284,19 @@ echo "$as_me: error: enable-targets opti
no) enable_targets= ;;
*) enable_targets=$enableval ;;
esac
+fi; # Check whether --enable-ld-targets or --disable-ld-targets was given.
+if test "${enable_ld_targets+set}" = set; then
+ enableval="$enable_ld_targets"
+ case "${enableval}" in
+ yes | "") { { echo "$as_me:$LINENO: error: enable-ld-targets option must specify target names or 'all'" >&5
+echo "$as_me: error: enable-ld-targets option must specify target names or 'all'" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ no) enable_ld_targets= ;;
+ *) enable_ld_targets=$enableval ;;
+esac
+else
+ enable_ld_targets=$enable_targets
fi; # Check whether --enable-64-bit-bfd or --disable-64-bit-bfd was given.
if test "${enable_64_bit_bfd+set}" = set; then
enableval="$enable_64_bit_bfd"
@@ -12958,7 +12972,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
--- ld/configure.in
+++ ld/configure.in
@@ -21,6 +21,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
@@ -187,7 +195,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