diff options
Diffstat (limited to 'libgloss/mcore')
| -rw-r--r-- | libgloss/mcore/aclocal.m4 | 1 | ||||
| -rwxr-xr-x | libgloss/mcore/configure | 69 | ||||
| -rw-r--r-- | libgloss/mcore/configure.ac | 11 |
3 files changed, 67 insertions, 14 deletions
diff --git a/libgloss/mcore/aclocal.m4 b/libgloss/mcore/aclocal.m4 index 24271f381..fab8217a4 100644 --- a/libgloss/mcore/aclocal.m4 +++ b/libgloss/mcore/aclocal.m4 @@ -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]) diff --git a/libgloss/mcore/configure b/libgloss/mcore/configure index 62f9f6926..840f4a959 100755 --- a/libgloss/mcore/configure +++ b/libgloss/mcore/configure @@ -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 diff --git a/libgloss/mcore/configure.ac b/libgloss/mcore/configure.ac index a314d4ee3..f6b3f0096 100644 --- a/libgloss/mcore/configure.ac +++ b/libgloss/mcore/configure.ac @@ -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 |