libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

libgloss: move to ../config/multi.m4 for multilib logic 

The current libgloss multilib logic is almost exactly the same as the
config/multi.m4, and the differences should be minor, so switch over
to that to delete custom logic on ourside.

The insertions here look larger and that's because none of the scripts
were declaring --enable-multilib explicitly even though they checked the
flag and changed behavior.
This commit is contained in:
Mike Frysinger 2022-01-23 23:24:52 -05:00
parent 30f244155b
commit 8622002ffc
39 changed files with 867 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libgloss/aarch64/aclocal.m4 vendored
View File

@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/depstand.m4])
m4_include([../../config/lead-dot.m4])
m4_include([../../config/multi.m4])
m4_include([../../config/override.m4])
m4_include([../acinclude.m4])

69
libgloss/aarch64/configure vendored
View File

@ -585,6 +585,7 @@ ac_unique_file="crt0.S"
enable_option_checking=no
ac_subst_vars='LTLIBOBJS
LIBOBJS
multi_basedir
subdirs
host_makefile_frag_path
objtype
@ -663,6 +664,7 @@ ac_subst_files='host_makefile_frag'
ac_user_opts='
enable_option_checking
enable_dependency_tracking
enable_multilib
'
ac_precious_vars='build_alias
host_alias
@ -1290,6 +1292,7 @@ Optional Features:
do not reject slow dependency extractors
--disable-dependency-tracking
speeds up one-time build
--enable-multilib build many library versions (default)
Some influential environment variables:
CCAS assembler compiler command (defaults to CC)
@ -2561,6 +2564,44 @@ subdirs="$subdirs cpu-init"
fi
# Default to --enable-multilib
# Check whether --enable-multilib was given.
if test "${enable_multilib+set}" = set; then :
enableval=$enable_multilib; case "$enableval" in
yes) multilib=yes ;;
no) multilib=no ;;
*) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;;
esac
else
multilib=yes
fi
# We may get other options which we leave undocumented:
# --with-target-subdir, --with-multisrctop, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
multi_basedir="$srcdir/$with_multisrctop../../.."
else
multi_basedir="$srcdir/$with_multisrctop../.."
fi
else
multi_basedir="$srcdir/../.."
fi
# Even if the default multilib is not a cross compilation,
# it may be that some of the other multilibs are.
if test $cross_compiling = no && test $multilib = yes \
&& test "x${with_multisubdir}" != x ; then
cross_compiling=maybe
fi
ac_config_commands="$ac_config_commands default-1"
ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF
@ -3277,12 +3318,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# INIT-COMMANDS
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
CC="$CC"
CXX="$CXX"
GFORTRAN="$GFORTRAN"
GCJ="$GCJ"
_ACEOF
@ -3293,6 +3342,7 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@ -3849,7 +3899,14 @@ $as_echo X"$file" |
done
}
;;
"Makefile":F) . ${srcdir}/../../config-ml.in ;;
"default-1":C)
# Only add multilib support code if we just rebuilt the top-level
# Makefile.
case " $CONFIG_FILES " in
*" Makefile "*)
ac_file=Makefile . ${multi_basedir}/config-ml.in
;;
esac ;;
esac
done # for ac_tag

11
libgloss/aarch64/configure.ac
View File

@ -43,12 +43,7 @@ if test -d "${srcdir}/cpu-init"; then
AC_SUBST(subdirs)
fi
AC_CONFIG_FILES(Makefile,
. ${srcdir}/../../config-ml.in,
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
)
AM_ENABLE_MULTILIB(, ../..)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

1
libgloss/aarch64/cpu-init/aclocal.m4 vendored
View File

@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../../config/depstand.m4])
m4_include([../../../config/lead-dot.m4])
m4_include([../../../config/multi.m4])
m4_include([../../../config/override.m4])
m4_include([../../acinclude.m4])

69
libgloss/aarch64/cpu-init/configure vendored
View File

@ -584,6 +584,7 @@ PACKAGE_URL=
ac_unique_file="Makefile.in"
ac_subst_vars='LTLIBOBJS
LIBOBJS
multi_basedir
host_makefile_frag_path
CCASFLAGS
CCAS
@ -660,6 +661,7 @@ ac_subst_files='host_makefile_frag'
ac_user_opts='
enable_option_checking
enable_dependency_tracking
enable_multilib
'
ac_precious_vars='build_alias
host_alias
@ -1287,6 +1289,7 @@ Optional Features:
do not reject slow dependency extractors
--disable-dependency-tracking
speeds up one-time build
--enable-multilib build many library versions (default)
Some influential environment variables:
CCAS assembler compiler command (defaults to CC)
@ -2540,6 +2543,44 @@ host_makefile_frag_path=$host_makefile_frag
# Default to --enable-multilib
# Check whether --enable-multilib was given.
if test "${enable_multilib+set}" = set; then :
enableval=$enable_multilib; case "$enableval" in
yes) multilib=yes ;;
no) multilib=no ;;
*) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;;
esac
else
multilib=yes
fi
# We may get other options which we leave undocumented:
# --with-target-subdir, --with-multisrctop, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
multi_basedir="$srcdir/$with_multisrctop../../../.."
else
multi_basedir="$srcdir/$with_multisrctop../../.."
fi
else
multi_basedir="$srcdir/../../.."
fi
# Even if the default multilib is not a cross compilation,
# it may be that some of the other multilibs are.
if test $cross_compiling = no && test $multilib = yes \
&& test "x${with_multisubdir}" != x ; then
cross_compiling=maybe
fi
ac_config_commands="$ac_config_commands default-1"
ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF
@ -3256,12 +3297,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# INIT-COMMANDS
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
CC="$CC"
CXX="$CXX"
GFORTRAN="$GFORTRAN"
GCJ="$GCJ"
_ACEOF
@ -3272,6 +3321,7 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@ -3828,7 +3878,14 @@ $as_echo X"$file" |
done
}
;;
"Makefile":F) . ${srcdir}/../../../config-ml.in ;;
"default-1":C)
# Only add multilib support code if we just rebuilt the top-level
# Makefile.
case " $CONFIG_FILES " in
*" Makefile "*)
ac_file=Makefile . ${multi_basedir}/config-ml.in
;;
esac ;;
esac
done # for ac_tag

11
libgloss/aarch64/cpu-init/configure.ac
View File

@ -28,12 +28,7 @@ host_makefile_frag_path=$host_makefile_frag
AC_SUBST(host_makefile_frag_path)
AC_SUBST_FILE(host_makefile_frag)
AC_CONFIG_FILES(Makefile,
. ${srcdir}/../../../config-ml.in,
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
)
AM_ENABLE_MULTILIB(, ../../..)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

1
libgloss/aclocal.m4 vendored
View File

@ -1133,5 +1133,6 @@ AC_SUBST([am__untar])
m4_include([../config/depstand.m4])
m4_include([../config/lead-dot.m4])
m4_include([../config/multi.m4])
m4_include([../config/override.m4])
m4_include([acinclude.m4])

1
libgloss/arm/aclocal.m4 vendored
View File

@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/depstand.m4])
m4_include([../../config/lead-dot.m4])
m4_include([../../config/multi.m4])
m4_include([../../config/override.m4])
m4_include([../acinclude.m4])

75
libgloss/arm/configure vendored
View File

@ -584,6 +584,7 @@ PACKAGE_URL=
ac_unique_file="redboot-crt0.S"
ac_subst_vars='LTLIBOBJS
LIBOBJS
multi_basedir
subdirs
host_makefile_frag_path
objtype
@ -665,6 +666,7 @@ ac_user_opts='
enable_option_checking
enable_newlib_supplied_syscalls
enable_dependency_tracking
enable_multilib
'
ac_precious_vars='build_alias
host_alias
@ -1293,6 +1295,7 @@ Optional Features:
do not reject slow dependency extractors
--disable-dependency-tracking
speeds up one-time build
--enable-multilib build many library versions (default)
Some influential environment variables:
CCAS assembler compiler command (defaults to CC)
@ -2587,6 +2590,44 @@ if test -d "${srcdir}/cpu-init"; then
fi
# Default to --enable-multilib
# Check whether --enable-multilib was given.
if test "${enable_multilib+set}" = set; then :
enableval=$enable_multilib; case "$enableval" in
yes) multilib=yes ;;
no) multilib=no ;;
*) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;;
esac
else
multilib=yes
fi
# We may get other options which we leave undocumented:
# --with-target-subdir, --with-multisrctop, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
multi_basedir="$srcdir/$with_multisrctop../../.."
else
multi_basedir="$srcdir/$with_multisrctop../.."
fi
else
multi_basedir="$srcdir/../.."
fi
# Even if the default multilib is not a cross compilation,
# it may be that some of the other multilibs are.
if test $cross_compiling = no && test $multilib = yes \
&& test "x${with_multisubdir}" != x ; then
cross_compiling=maybe
fi
ac_config_commands="$ac_config_commands default-1"
ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF
@ -3303,18 +3344,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# INIT-COMMANDS
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
CC="$CC"
CXX="$CXX"
GFORTRAN="$GFORTRAN"
GCJ="$GCJ"
_ACEOF
@ -3326,6 +3369,7 @@ do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"cpu-init/Makefile") CONFIG_FILES="$CONFIG_FILES cpu-init/Makefile" ;;
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@ -3882,8 +3926,14 @@ $as_echo X"$file" |
done
}
;;
"cpu-init/Makefile":F) . ${srcdir}/../../config-ml.in ;;
"Makefile":F) . ${srcdir}/../../config-ml.in ;;
"default-1":C)
# Only add multilib support code if we just rebuilt the top-level
# Makefile.
case " $CONFIG_FILES " in
*" Makefile "*)
ac_file=Makefile . ${multi_basedir}/config-ml.in
;;
esac ;;
esac
done # for ac_tag
@ -3922,4 +3972,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi

21
libgloss/arm/configure.ac
View File

@ -62,24 +62,11 @@ AC_SUBST_FILE(host_makefile_frag)
# Configure cpu init plug-ins
if test -d "${srcdir}/cpu-init"; then
subdirs="${subdirs} cpu-init"
AC_CONFIG_FILES(cpu-init/Makefile,
. ${srcdir}/../../config-ml.in,
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
)
AC_CONFIG_FILES([cpu-init/Makefile])
AC_SUBST(subdirs)
fi
AC_CONFIG_FILES(Makefile,
. ${srcdir}/../../config-ml.in,
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
)
AC_OUTPUT
AM_ENABLE_MULTILIB(, ../..)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

78
libgloss/configure vendored
View File

@ -587,6 +587,7 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
multi_basedir
target_makefile_frag_path
host_makefile_frag_path
CPP
@ -697,6 +698,7 @@ ac_user_opts='
enable_option_checking
enable_silent_rules
enable_dependency_tracking
enable_multilib
'
ac_precious_vars='build_alias
host_alias
@ -1345,6 +1347,7 @@ Optional Features:
do not reject slow dependency extractors
--disable-dependency-tracking
speeds up one-time build
--enable-multilib build many library versions (default)
Some influential environment variables:
CCAS assembler compiler command (defaults to CC)
@ -4791,13 +4794,44 @@ target_makefile_frag_path=$target_makefile_frag
if test "${multilib}" = "yes"; then
multilib_arg="--enable-multilib"
# Default to --enable-multilib
# Check whether --enable-multilib was given.
if test "${enable_multilib+set}" = set; then :
enableval=$enable_multilib; case "$enableval" in
yes) multilib=yes ;;
no) multilib=no ;;
*) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;;
esac
else
multilib_arg=
multilib=yes
fi
# for now, only add multilibs for specific targets
# We may get other options which we leave undocumented:
# --with-target-subdir, --with-multisrctop, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
multi_basedir="$srcdir/$with_multisrctop../.."
else
multi_basedir="$srcdir/$with_multisrctop.."
fi
else
multi_basedir="$srcdir/.."
fi
# Even if the default multilib is not a cross compilation,
# it may be that some of the other multilibs are.
if test $cross_compiling = no && test $multilib = yes \
&& test "x${with_multisubdir}" != x ; then
cross_compiling=maybe
fi
ac_config_commands="$ac_config_commands default-1"
ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF
@ -5520,15 +5554,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# INIT-COMMANDS
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
srcdir=${srcdir}
target=${target}
host=${host}
with_multisubdir=${with_multisubdir}
ac_configure_args="--enable-multilib ${ac_configure_args}"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
CC="${CC}"
LDFLAGS=${LDFLAGS}
srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
CC="$CC"
CXX="$CXX"
GFORTRAN="$GFORTRAN"
GCJ="$GCJ"
_ACEOF
@ -5578,6 +5617,7 @@ do
"nios2/Makefile") CONFIG_FILES="$CONFIG_FILES nios2/Makefile" ;;
"libnosys/Makefile") CONFIG_FILES="$CONFIG_FILES libnosys/Makefile" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@ -6306,10 +6346,14 @@ $as_echo X"$file" |
done
}
;;
"Makefile":F) if test -n "$CONFIG_FILES"; then
unset ac_file
. ${srcdir}/../config-ml.in
fi ;;
"default-1":C)
# Only add multilib support code if we just rebuilt the top-level
# Makefile.
case " $CONFIG_FILES " in
*" Makefile "*)
ac_file=Makefile . ${multi_basedir}/config-ml.in
;;
esac ;;
esac
done # for ac_tag
@ -6493,5 +6537,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi

24
libgloss/configure.ac
View File

@ -330,27 +330,7 @@ target_makefile_frag_path=$target_makefile_frag
AC_SUBST(target_makefile_frag_path)
AC_SUBST_FILE(target_makefile_frag)
if test "${multilib}" = "yes"; then
multilib_arg="--enable-multilib"
else
multilib_arg=
fi
AM_ENABLE_MULTILIB(, ..)
# for now, only add multilibs for specific targets
AC_CONFIG_FILES([Makefile],
[if test -n "$CONFIG_FILES"; then
unset ac_file
. ${srcdir}/../config-ml.in
fi],
srcdir=${srcdir}
target=${target}
host=${host}
with_multisubdir=${with_multisubdir}
ac_configure_args="--enable-multilib ${ac_configure_args}"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
CC="${CC}"
LDFLAGS=${LDFLAGS}
)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

1
libgloss/csky/aclocal.m4 vendored
View File

@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/depstand.m4])
m4_include([../../config/lead-dot.m4])
m4_include([../../config/multi.m4])
m4_include([../../config/override.m4])
m4_include([../acinclude.m4])

70
libgloss/csky/configure vendored
View File

@ -584,6 +584,7 @@ PACKAGE_URL=
ac_unique_file="crt0.S"
ac_subst_vars='LTLIBOBJS
LIBOBJS
multi_basedir
target_makefile_frag_path
host_makefile_frag_path
DO
@ -670,6 +671,7 @@ target_makefile_frag'
ac_user_opts='
enable_option_checking
enable_dependency_tracking
enable_multilib
'
ac_precious_vars='build_alias
host_alias
@ -1303,6 +1305,7 @@ Optional Features:
do not reject slow dependency extractors
--disable-dependency-tracking
speeds up one-time build
--enable-multilib build many library versions (default)
Some influential environment variables:
CCAS assembler compiler command (defaults to CC)
@ -3577,6 +3580,44 @@ target_makefile_frag_path=$target_makefile_frag
# Default to --enable-multilib
# Check whether --enable-multilib was given.
if test "${enable_multilib+set}" = set; then :
enableval=$enable_multilib; case "$enableval" in
yes) multilib=yes ;;
no) multilib=no ;;
*) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;;
esac
else
multilib=yes
fi
# We may get other options which we leave undocumented:
# --with-target-subdir, --with-multisrctop, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
multi_basedir="$srcdir/$with_multisrctop../../.."
else
multi_basedir="$srcdir/$with_multisrctop../.."
fi
else
multi_basedir="$srcdir/../.."
fi
# Even if the default multilib is not a cross compilation,
# it may be that some of the other multilibs are.
if test $cross_compiling = no && test $multilib = yes \
&& test "x${with_multisubdir}" != x ; then
cross_compiling=maybe
fi
ac_config_commands="$ac_config_commands default-1"
ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF
@ -4293,12 +4334,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# INIT-COMMANDS
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
CC="$CC"
CXX="$CXX"
GFORTRAN="$GFORTRAN"
GCJ="$GCJ"
_ACEOF
@ -4309,6 +4358,7 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@ -4865,7 +4915,14 @@ $as_echo X"$file" |
done
}
;;
"Makefile":F) . ${srcdir}/../../config-ml.in ;;
"default-1":C)
# Only add multilib support code if we just rebuilt the top-level
# Makefile.
case " $CONFIG_FILES " in
*" Makefile "*)
ac_file=Makefile . ${multi_basedir}/config-ml.in
;;
esac ;;
esac
done # for ac_tag
@ -4904,4 +4961,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi

12
libgloss/csky/configure.ac
View File

@ -65,13 +65,7 @@ target_makefile_frag_path=$target_makefile_frag
AC_SUBST(target_makefile_frag_path)
AC_SUBST_FILE(target_makefile_frag)
AC_CONFIG_FILES(Makefile,
. ${srcdir}/../../config-ml.in,
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
)
AC_OUTPUT
AM_ENABLE_MULTILIB(, ../..)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

1
libgloss/i386/aclocal.m4 vendored
View File

@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/depstand.m4])
m4_include([../../config/lead-dot.m4])
m4_include([../../config/multi.m4])
m4_include([../../config/override.m4])
m4_include([../acinclude.m4])

69
libgloss/i386/configure vendored
View File

@ -584,6 +584,7 @@ PACKAGE_URL=
ac_unique_file="cygmon-salib.c"
ac_subst_vars='LTLIBOBJS
LIBOBJS
multi_basedir
host_makefile_frag_path
CCASFLAGS
CCAS
@ -663,6 +664,7 @@ ac_subst_files='host_makefile_frag'
ac_user_opts='
enable_option_checking
enable_dependency_tracking
enable_multilib
'
ac_precious_vars='build_alias
host_alias
@ -1290,6 +1292,7 @@ Optional Features:
do not reject slow dependency extractors
--disable-dependency-tracking
speeds up one-time build
--enable-multilib build many library versions (default)
Some influential environment variables:
CCAS assembler compiler command (defaults to CC)
@ -2555,6 +2558,44 @@ host_makefile_frag_path=$host_makefile_frag
# Default to --enable-multilib
# Check whether --enable-multilib was given.
if test "${enable_multilib+set}" = set; then :
enableval=$enable_multilib; case "$enableval" in
yes) multilib=yes ;;
no) multilib=no ;;
*) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;;
esac
else
multilib=yes
fi
# We may get other options which we leave undocumented:
# --with-target-subdir, --with-multisrctop, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
multi_basedir="$srcdir/$with_multisrctop../../.."
else
multi_basedir="$srcdir/$with_multisrctop../.."
fi
else
multi_basedir="$srcdir/../.."
fi
# Even if the default multilib is not a cross compilation,
# it may be that some of the other multilibs are.
if test $cross_compiling = no && test $multilib = yes \
&& test "x${with_multisubdir}" != x ; then
cross_compiling=maybe
fi
ac_config_commands="$ac_config_commands default-1"
ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF
@ -3271,12 +3312,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# INIT-COMMANDS
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
CC="$CC"
CXX="$CXX"
GFORTRAN="$GFORTRAN"
GCJ="$GCJ"
_ACEOF
@ -3287,6 +3336,7 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@ -3843,7 +3893,14 @@ $as_echo X"$file" |
done
}
;;
"Makefile":F) . ${srcdir}/../../config-ml.in ;;
"default-1":C)
# Only add multilib support code if we just rebuilt the top-level
# Makefile.
case " $CONFIG_FILES " in
*" Makefile "*)
ac_file=Makefile . ${multi_basedir}/config-ml.in
;;
esac ;;
esac
done # for ac_tag

11
libgloss/i386/configure.ac
View File

@ -53,12 +53,7 @@ host_makefile_frag_path=$host_makefile_frag
AC_SUBST(host_makefile_frag_path)
AC_SUBST_FILE(host_makefile_frag)
AC_CONFIG_FILES(Makefile,
. ${srcdir}/../../config-ml.in,
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
)
AM_ENABLE_MULTILIB(, ../..)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

1
libgloss/m68k/aclocal.m4 vendored
View File

@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/depstand.m4])
m4_include([../../config/lead-dot.m4])
m4_include([../../config/multi.m4])
m4_include([../../config/override.m4])
m4_include([../acinclude.m4])

70
libgloss/m68k/configure vendored
View File

@ -584,6 +584,7 @@ PACKAGE_URL=
ac_unique_file="crt0.S"
ac_subst_vars='LTLIBOBJS
LIBOBJS
multi_basedir
target_makefile_frag_path
host_makefile_frag_path
DO
@ -670,6 +671,7 @@ target_makefile_frag'
ac_user_opts='
enable_option_checking
enable_dependency_tracking
enable_multilib
'
ac_precious_vars='build_alias
host_alias
@ -1303,6 +1305,7 @@ Optional Features:
do not reject slow dependency extractors
--disable-dependency-tracking
speeds up one-time build
--enable-multilib build many library versions (default)
Some influential environment variables:
CCAS assembler compiler command (defaults to CC)
@ -3577,6 +3580,44 @@ target_makefile_frag_path=$target_makefile_frag
# Default to --enable-multilib
# Check whether --enable-multilib was given.
if test "${enable_multilib+set}" = set; then :
enableval=$enable_multilib; case "$enableval" in
yes) multilib=yes ;;
no) multilib=no ;;
*) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;;
esac
else
multilib=yes
fi
# We may get other options which we leave undocumented:
# --with-target-subdir, --with-multisrctop, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
multi_basedir="$srcdir/$with_multisrctop../../.."
else
multi_basedir="$srcdir/$with_multisrctop../.."
fi
else
multi_basedir="$srcdir/../.."
fi
# Even if the default multilib is not a cross compilation,
# it may be that some of the other multilibs are.
if test $cross_compiling = no && test $multilib = yes \
&& test "x${with_multisubdir}" != x ; then
cross_compiling=maybe
fi
ac_config_commands="$ac_config_commands default-1"
ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF
@ -4293,12 +4334,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# INIT-COMMANDS
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
CC="$CC"
CXX="$CXX"
GFORTRAN="$GFORTRAN"
GCJ="$GCJ"
_ACEOF
@ -4309,6 +4358,7 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@ -4865,7 +4915,14 @@ $as_echo X"$file" |
done
}
;;
"Makefile":F) . ${srcdir}/../../config-ml.in ;;
"default-1":C)
# Only add multilib support code if we just rebuilt the top-level
# Makefile.
case " $CONFIG_FILES " in
*" Makefile "*)
ac_file=Makefile . ${multi_basedir}/config-ml.in
;;
esac ;;
esac
done # for ac_tag
@ -4904,4 +4961,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi

12
libgloss/m68k/configure.ac
View File

@ -65,13 +65,7 @@ target_makefile_frag_path=$target_makefile_frag
AC_SUBST(target_makefile_frag_path)
AC_SUBST_FILE(target_makefile_frag)
AC_CONFIG_FILES(Makefile,
. ${srcdir}/../../config-ml.in,
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
)
AC_OUTPUT
AM_ENABLE_MULTILIB(, ../..)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

1
libgloss/mcore/aclocal.m4 vendored
View File

@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/depstand.m4])
m4_include([../../config/lead-dot.m4])
m4_include([../../config/multi.m4])
m4_include([../../config/override.m4])
m4_include([../acinclude.m4])

69
libgloss/mcore/configure vendored
View File

@ -584,6 +584,7 @@ PACKAGE_URL=
ac_unique_file="crt0.S"
ac_subst_vars='LTLIBOBJS
LIBOBJS
multi_basedir
host_makefile_frag_path
bsp_prefix
CCASFLAGS
@ -661,6 +662,7 @@ ac_subst_files='host_makefile_frag'
ac_user_opts='
enable_option_checking
enable_dependency_tracking
enable_multilib
'
ac_precious_vars='build_alias
host_alias
@ -1288,6 +1290,7 @@ Optional Features:
do not reject slow dependency extractors
--disable-dependency-tracking
speeds up one-time build
--enable-multilib build many library versions (default)
Some influential environment variables:
CCAS assembler compiler command (defaults to CC)
@ -2552,6 +2555,44 @@ host_makefile_frag_path=$host_makefile_frag
# Default to --enable-multilib
# Check whether --enable-multilib was given.
if test "${enable_multilib+set}" = set; then :
enableval=$enable_multilib; case "$enableval" in
yes) multilib=yes ;;
no) multilib=no ;;
*) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;;
esac
else
multilib=yes
fi
# We may get other options which we leave undocumented:
# --with-target-subdir, --with-multisrctop, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
multi_basedir="$srcdir/$with_multisrctop../../.."
else
multi_basedir="$srcdir/$with_multisrctop../.."
fi
else
multi_basedir="$srcdir/../.."
fi
# Even if the default multilib is not a cross compilation,
# it may be that some of the other multilibs are.
if test $cross_compiling = no && test $multilib = yes \
&& test "x${with_multisubdir}" != x ; then
cross_compiling=maybe
fi
ac_config_commands="$ac_config_commands default-1"
ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF
@ -3268,12 +3309,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# INIT-COMMANDS
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
CC="$CC"
CXX="$CXX"
GFORTRAN="$GFORTRAN"
GCJ="$GCJ"
_ACEOF
@ -3284,6 +3333,7 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@ -3840,7 +3890,14 @@ $as_echo X"$file" |
done
}
;;
"Makefile":F) . ${srcdir}/../../config-ml.in ;;
"default-1":C)
# Only add multilib support code if we just rebuilt the top-level
# Makefile.
case " $CONFIG_FILES " in
*" Makefile "*)
ac_file=Makefile . ${multi_basedir}/config-ml.in
;;
esac ;;
esac
done # for ac_tag

11
libgloss/mcore/configure.ac
View File

@ -39,12 +39,7 @@ host_makefile_frag_path=$host_makefile_frag
AC_SUBST(host_makefile_frag_path)
AC_SUBST_FILE(host_makefile_frag)
AC_CONFIG_FILES(Makefile,
. ${srcdir}/../../config-ml.in,
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
)
AM_ENABLE_MULTILIB(, ../..)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

1
libgloss/mips/aclocal.m4 vendored
View File

@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/depstand.m4])
m4_include([../../config/lead-dot.m4])
m4_include([../../config/multi.m4])
m4_include([../../config/override.m4])
m4_include([../acinclude.m4])

69
libgloss/mips/configure vendored
View File

@ -584,6 +584,7 @@ PACKAGE_URL=
ac_unique_file="crt0.S"
ac_subst_vars='LTLIBOBJS
LIBOBJS
multi_basedir
pcrt0
crt0
bsp_list
@ -668,6 +669,7 @@ target_makefile_frag'
ac_user_opts='
enable_option_checking
enable_dependency_tracking
enable_multilib
'
ac_precious_vars='build_alias
host_alias
@ -1295,6 +1297,7 @@ Optional Features:
do not reject slow dependency extractors
--disable-dependency-tracking
speeds up one-time build
--enable-multilib build many library versions (default)
Some influential environment variables:
CCAS assembler compiler command (defaults to CC)
@ -2604,6 +2607,44 @@ target_makefile_frag_path=$target_makefile_frag
# Default to --enable-multilib
# Check whether --enable-multilib was given.
if test "${enable_multilib+set}" = set; then :
enableval=$enable_multilib; case "$enableval" in
yes) multilib=yes ;;
no) multilib=no ;;
*) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;;
esac
else
multilib=yes
fi
# We may get other options which we leave undocumented:
# --with-target-subdir, --with-multisrctop, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
multi_basedir="$srcdir/$with_multisrctop../../.."
else
multi_basedir="$srcdir/$with_multisrctop../.."
fi
else
multi_basedir="$srcdir/../.."
fi
# Even if the default multilib is not a cross compilation,
# it may be that some of the other multilibs are.
if test $cross_compiling = no && test $multilib = yes \
&& test "x${with_multisubdir}" != x ; then
cross_compiling=maybe
fi
ac_config_commands="$ac_config_commands default-1"
ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF
@ -3320,12 +3361,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# INIT-COMMANDS
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
CC="$CC"
CXX="$CXX"
GFORTRAN="$GFORTRAN"
GCJ="$GCJ"
_ACEOF
@ -3336,6 +3385,7 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@ -3892,7 +3942,14 @@ $as_echo X"$file" |
done
}
;;
"Makefile":F) . ${srcdir}/../../config-ml.in ;;
"default-1":C)
# Only add multilib support code if we just rebuilt the top-level
# Makefile.
case " $CONFIG_FILES " in
*" Makefile "*)
ac_file=Makefile . ${multi_basedir}/config-ml.in
;;
esac ;;
esac
done # for ac_tag

11
libgloss/mips/configure.ac
View File

@ -97,12 +97,7 @@ AC_SUBST(bsp_list)
AC_SUBST(crt0)
AC_SUBST(pcrt0)
AC_CONFIG_FILES(Makefile,
. ${srcdir}/../../config-ml.in,
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
)
AM_ENABLE_MULTILIB(, ../..)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

1
libgloss/mn10200/aclocal.m4 vendored
View File

@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/depstand.m4])
m4_include([../../config/lead-dot.m4])
m4_include([../../config/multi.m4])
m4_include([../../config/override.m4])
m4_include([../acinclude.m4])

71
libgloss/mn10200/configure vendored
View File

@ -584,6 +584,7 @@ PACKAGE_URL=
ac_unique_file="crt0.S"
ac_subst_vars='LTLIBOBJS
LIBOBJS
multi_basedir
part_specific_obj
target_makefile_frag_path
host_makefile_frag_path
@ -663,6 +664,7 @@ target_makefile_frag'
ac_user_opts='
enable_option_checking
enable_dependency_tracking
enable_multilib
'
ac_precious_vars='build_alias
host_alias
@ -1290,6 +1292,7 @@ Optional Features:
do not reject slow dependency extractors
--disable-dependency-tracking
speeds up one-time build
--enable-multilib build many library versions (default)
Some influential environment variables:
CCAS assembler compiler command (defaults to CC)
@ -2554,6 +2557,44 @@ target_makefile_frag_path=$target_makefile_frag
# Default to --enable-multilib
# Check whether --enable-multilib was given.
if test "${enable_multilib+set}" = set; then :
enableval=$enable_multilib; case "$enableval" in
yes) multilib=yes ;;
no) multilib=no ;;
*) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;;
esac
else
multilib=yes
fi
# We may get other options which we leave undocumented:
# --with-target-subdir, --with-multisrctop, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
multi_basedir="$srcdir/$with_multisrctop../../.."
else
multi_basedir="$srcdir/$with_multisrctop../.."
fi
else
multi_basedir="$srcdir/../.."
fi
# Even if the default multilib is not a cross compilation,
# it may be that some of the other multilibs are.
if test $cross_compiling = no && test $multilib = yes \
&& test "x${with_multisubdir}" != x ; then
cross_compiling=maybe
fi
ac_config_commands="$ac_config_commands default-1"
ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF
@ -3270,12 +3311,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# INIT-COMMANDS
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
CC="$CC"
CXX="$CXX"
GFORTRAN="$GFORTRAN"
GCJ="$GCJ"
_ACEOF
@ -3286,6 +3335,7 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@ -3842,7 +3892,14 @@ $as_echo X"$file" |
done
}
;;
"Makefile":F) . ${srcdir}/../../config-ml.in ;;
"default-1":C)
# Only add multilib support code if we just rebuilt the top-level
# Makefile.
case " $CONFIG_FILES " in
*" Makefile "*)
ac_file=Makefile . ${multi_basedir}/config-ml.in
;;
esac ;;
esac
done # for ac_tag
@ -3881,5 +3938,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi

13
libgloss/mn10200/configure.ac
View File

@ -52,14 +52,7 @@ AC_SUBST(target_makefile_frag_path)
AC_SUBST_FILE(target_makefile_frag)
AC_SUBST(part_specific_obj)
AC_CONFIG_FILES(Makefile,
. ${srcdir}/../../config-ml.in,
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
)
AM_ENABLE_MULTILIB(, ../..)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

1
libgloss/mn10300/aclocal.m4 vendored
View File

@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/depstand.m4])
m4_include([../../config/lead-dot.m4])
m4_include([../../config/multi.m4])
m4_include([../../config/override.m4])
m4_include([../acinclude.m4])

74
libgloss/mn10300/configure vendored
View File

@ -584,6 +584,7 @@ PACKAGE_URL=
ac_unique_file="crt0.S"
ac_subst_vars='LTLIBOBJS
LIBOBJS
multi_basedir
bsp_list
script_list
part_specific_obj
@ -665,6 +666,7 @@ target_makefile_frag'
ac_user_opts='
enable_option_checking
enable_dependency_tracking
enable_multilib
'
ac_precious_vars='build_alias
host_alias
@ -1292,6 +1294,7 @@ Optional Features:
do not reject slow dependency extractors
--disable-dependency-tracking
speeds up one-time build
--enable-multilib build many library versions (default)
Some influential environment variables:
CCAS assembler compiler command (defaults to CC)
@ -2565,6 +2568,44 @@ target_makefile_frag_path=$target_makefile_frag
# Default to --enable-multilib
# Check whether --enable-multilib was given.
if test "${enable_multilib+set}" = set; then :
enableval=$enable_multilib; case "$enableval" in
yes) multilib=yes ;;
no) multilib=no ;;
*) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;;
esac
else
multilib=yes
fi
# We may get other options which we leave undocumented:
# --with-target-subdir, --with-multisrctop, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
multi_basedir="$srcdir/$with_multisrctop../../.."
else
multi_basedir="$srcdir/$with_multisrctop../.."
fi
else
multi_basedir="$srcdir/../.."
fi
# Even if the default multilib is not a cross compilation,
# it may be that some of the other multilibs are.
if test $cross_compiling = no && test $multilib = yes \
&& test "x${with_multisubdir}" != x ; then
cross_compiling=maybe
fi
ac_config_commands="$ac_config_commands default-1"
ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF
@ -3281,12 +3322,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# INIT-COMMANDS
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
CC="$CC"
CXX="$CXX"
GFORTRAN="$GFORTRAN"
GCJ="$GCJ"
_ACEOF
@ -3297,6 +3346,7 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@ -3853,10 +3903,14 @@ $as_echo X"$file" |
done
}
;;
"Makefile":F) if test -n "$CONFIG_FILES"; then
unset ac_file
. ${srcdir}/../../config-ml.in
fi ;;
"default-1":C)
# Only add multilib support code if we just rebuilt the top-level
# Makefile.
case " $CONFIG_FILES " in
*" Makefile "*)
ac_file=Makefile . ${multi_basedir}/config-ml.in
;;
esac ;;
esac
done # for ac_tag
@ -3895,5 +3949,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi

16
libgloss/mn10300/configure.ac
View File

@ -61,17 +61,7 @@ AC_SUBST(part_specific_obj)
AC_SUBST(script_list)
AC_SUBST(bsp_list)
AC_CONFIG_FILES([Makefile],
[if test -n "$CONFIG_FILES"; then
unset ac_file
. ${srcdir}/../../config-ml.in
fi],
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
)
AM_ENABLE_MULTILIB(, ../..)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

1
libgloss/moxie/aclocal.m4 vendored
View File

@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/depstand.m4])
m4_include([../../config/lead-dot.m4])
m4_include([../../config/multi.m4])
m4_include([../../config/override.m4])
m4_include([../acinclude.m4])

69
libgloss/moxie/configure vendored
View File

@ -584,6 +584,7 @@ PACKAGE_URL=
ac_unique_file="crt0.S"
ac_subst_vars='LTLIBOBJS
LIBOBJS
multi_basedir
host_makefile_frag_path
BUILD_CRT0_FALSE
BUILD_CRT0_TRUE
@ -662,6 +663,7 @@ ac_subst_files='host_makefile_frag'
ac_user_opts='
enable_option_checking
enable_dependency_tracking
enable_multilib
'
ac_precious_vars='build_alias
host_alias
@ -1289,6 +1291,7 @@ Optional Features:
do not reject slow dependency extractors
--disable-dependency-tracking
speeds up one-time build
--enable-multilib build many library versions (default)
Some influential environment variables:
CCAS assembler compiler command (defaults to CC)
@ -2557,6 +2560,44 @@ host_makefile_frag_path=$host_makefile_frag
# Default to --enable-multilib
# Check whether --enable-multilib was given.
if test "${enable_multilib+set}" = set; then :
enableval=$enable_multilib; case "$enableval" in
yes) multilib=yes ;;
no) multilib=no ;;
*) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;;
esac
else
multilib=yes
fi
# We may get other options which we leave undocumented:
# --with-target-subdir, --with-multisrctop, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
multi_basedir="$srcdir/$with_multisrctop../../.."
else
multi_basedir="$srcdir/$with_multisrctop../.."
fi
else
multi_basedir="$srcdir/../.."
fi
# Even if the default multilib is not a cross compilation,
# it may be that some of the other multilibs are.
if test $cross_compiling = no && test $multilib = yes \
&& test "x${with_multisubdir}" != x ; then
cross_compiling=maybe
fi
ac_config_commands="$ac_config_commands default-1"
ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF
@ -3273,12 +3314,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# INIT-COMMANDS
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
CC="$CC"
CXX="$CXX"
GFORTRAN="$GFORTRAN"
GCJ="$GCJ"
_ACEOF
@ -3289,6 +3338,7 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@ -3845,7 +3895,14 @@ $as_echo X"$file" |
done
}
;;
"Makefile":F) . ${srcdir}/../../config-ml.in ;;
"default-1":C)
# Only add multilib support code if we just rebuilt the top-level
# Makefile.
case " $CONFIG_FILES " in
*" Makefile "*)
ac_file=Makefile . ${multi_basedir}/config-ml.in
;;
esac ;;
esac
done # for ac_tag

11
libgloss/moxie/configure.ac
View File

@ -44,12 +44,7 @@ host_makefile_frag_path=$host_makefile_frag
AC_SUBST(host_makefile_frag_path)
AC_SUBST_FILE(host_makefile_frag)
AC_CONFIG_FILES(Makefile,
. ${srcdir}/../../config-ml.in,
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
)
AM_ENABLE_MULTILIB(, ../..)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

1
libgloss/sparc/aclocal.m4 vendored
View File

@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/depstand.m4])
m4_include([../../config/lead-dot.m4])
m4_include([../../config/multi.m4])
m4_include([../../config/override.m4])
m4_include([../acinclude.m4])

73
libgloss/sparc/configure vendored
View File

@ -585,6 +585,7 @@ ac_unique_file="sparc-stub.c"
enable_option_checking=no
ac_subst_vars='LTLIBOBJS
LIBOBJS
multi_basedir
CYGMONLDSCRIPTTEMPL
target_makefile_frag_path
host_makefile_frag_path
@ -666,6 +667,7 @@ target_makefile_frag'
ac_user_opts='
enable_option_checking
enable_dependency_tracking
enable_multilib
'
ac_precious_vars='build_alias
host_alias
@ -1288,6 +1290,7 @@ Optional Features:
do not reject slow dependency extractors
--disable-dependency-tracking
speeds up one-time build
--enable-multilib build many library versions (default)
Some influential environment variables:
CCAS assembler compiler command (defaults to CC)
@ -2554,9 +2557,45 @@ target_makefile_frag_path=$target_makefile_frag
ac_config_files="$ac_config_files Makefile"
# Default to --enable-multilib
# Check whether --enable-multilib was given.
if test "${enable_multilib+set}" = set; then :
enableval=$enable_multilib; case "$enableval" in
yes) multilib=yes ;;
no) multilib=no ;;
*) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;;
esac
else
multilib=yes
fi
ac_config_commands="$ac_config_commands default"
# We may get other options which we leave undocumented:
# --with-target-subdir, --with-multisrctop, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
multi_basedir="$srcdir/$with_multisrctop../../.."
else
multi_basedir="$srcdir/$with_multisrctop../.."
fi
else
multi_basedir="$srcdir/../.."
fi
# Even if the default multilib is not a cross compilation,
# it may be that some of the other multilibs are.
if test $cross_compiling = no && test $multilib = yes \
&& test "x${with_multisubdir}" != x ; then
cross_compiling=maybe
fi
ac_config_commands="$ac_config_commands default-1"
ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@ -3272,12 +3311,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# INIT-COMMANDS
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
CC="$CC"
CXX="$CXX"
GFORTRAN="$GFORTRAN"
GCJ="$GCJ"
_ACEOF
@ -3288,8 +3335,8 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
@ -3845,7 +3892,14 @@ $as_echo X"$file" |
done
}
;;
"default":C) . ${srcdir}/../../config-ml.in ;;
"default-1":C)
# Only add multilib support code if we just rebuilt the top-level
# Makefile.
case " $CONFIG_FILES " in
*" Makefile "*)
ac_file=Makefile . ${multi_basedir}/config-ml.in
;;
esac ;;
esac
done # for ac_tag
@ -4029,4 +4083,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi

11
libgloss/sparc/configure.ac
View File

@ -58,12 +58,7 @@ AC_SUBST(target_makefile_frag_path)
AC_SUBST_FILE(target_makefile_frag)
AC_SUBST(CYGMONLDSCRIPTTEMPL)
AC_OUTPUT(Makefile,
. ${srcdir}/../../config-ml.in,
srcdir=${srcdir}
target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
)
AM_ENABLE_MULTILIB(, ../..)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT