2006-12-29 Paolo Bonzini <bonzini@gnu.org>
Sync with gcc:
2006-12-29 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Reorganize recognition of languages. Add
--enable-stage1-languages. Show supported languages for the chosen
target rather than all recognized languages.
* configure: Regenerate.
2006-12-29 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (GCC_STRAP_TARGETS, all-prebootstrap): Remove.
* Makefile.in: Regenerate.
2006-12-29 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* configure.in: Warn that MPFR 2.2.0 is buggy.
* configure: Regenerate.
config:
2006-12-29 Paolo Bonzini <bonzini@gnu.org>
* acx.m4: Sync with gcc.
This commit is contained in:
Paolo Bonzini
parent
cab8ac940a
commit
9b134994af
7 changed files with 376 additions and 392 deletions
20
ChangeLog
20
ChangeLog
|
|
@ -1,3 +1,23 @@
|
|||
2006-12-29 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
Sync with gcc:
|
||||
2006-12-29 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
* configure.in: Reorganize recognition of languages. Add
|
||||
--enable-stage1-languages. Show supported languages for the chosen
|
||||
target rather than all recognized languages.
|
||||
* configure: Regenerate.
|
||||
|
||||
2006-12-29 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
* Makefile.tpl (GCC_STRAP_TARGETS, all-prebootstrap): Remove.
|
||||
* Makefile.in: Regenerate.
|
||||
|
||||
2006-12-29 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
|
||||
|
||||
* configure.in: Warn that MPFR 2.2.0 is buggy.
|
||||
* configure: Regenerate.
|
||||
|
||||
2006-12-27 Ian Lance Taylor <iant@google.com>
|
||||
|
||||
* configure.in: When removing Makefiles to force a reconfigure, also
|
||||
|
|
|
|||
82
Makefile.in
82
Makefile.in
|
|
@ -41713,60 +41713,6 @@ maintainer-clean-target-libgomp:
|
|||
# ----------
|
||||
|
||||
@if gcc-no-bootstrap
|
||||
# GCC has some more recursive targets, which trigger the old
|
||||
# (but still current, until the toplevel bootstrap project
|
||||
# is finished) compiler bootstrapping rules.
|
||||
|
||||
GCC_STRAP_TARGETS = bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap
|
||||
.PHONY: $(GCC_STRAP_TARGETS)
|
||||
$(GCC_STRAP_TARGETS): all-prebootstrap configure-gcc
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(HOST_EXPORTS) \
|
||||
echo "Bootstrapping the compiler"; \
|
||||
$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,:[ :]*,:,g;s,^[ :]*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
|
||||
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
case "$@" in \
|
||||
*bootstrap4-lean ) \
|
||||
msg="Comparing stage3 and stage4 of the compiler"; \
|
||||
compare=compare3-lean ;; \
|
||||
*bootstrap4 ) \
|
||||
msg="Comparing stage3 and stage4 of the compiler"; \
|
||||
compare=compare3 ;; \
|
||||
*-lean ) \
|
||||
msg="Comparing stage2 and stage3 of the compiler"; \
|
||||
compare=compare-lean ;; \
|
||||
* ) \
|
||||
msg="Comparing stage2 and stage3 of the compiler"; \
|
||||
compare=compare ;; \
|
||||
esac; \
|
||||
$(HOST_EXPORTS) \
|
||||
echo "$$msg"; \
|
||||
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
|
||||
echo "Building runtime libraries"; \
|
||||
$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
|
||||
|
||||
profiledbootstrap: all-prebootstrap configure-gcc
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(HOST_EXPORTS) \
|
||||
$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,:[ :]*,:,g;s,^[ :]*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
|
||||
echo "Bootstrapping training compiler"; \
|
||||
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stageprofile_build
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(HOST_EXPORTS) \
|
||||
echo "Building feedback based compiler"; \
|
||||
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stagefeedback_build
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
|
||||
echo "Building runtime libraries"; \
|
||||
$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
|
||||
|
||||
.PHONY: cross
|
||||
cross: all-build all-gas all-ld
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
|
|
@ -43337,7 +43283,6 @@ all-stage3-gcc: maybe-all-build-texinfo
|
|||
all-stage4-gcc: maybe-all-build-texinfo
|
||||
all-stageprofile-gcc: maybe-all-build-texinfo
|
||||
all-stagefeedback-gcc: maybe-all-build-texinfo
|
||||
all-prebootstrap: maybe-all-build-texinfo
|
||||
all-gcc: maybe-all-build-bison
|
||||
|
||||
all-stage1-gcc: maybe-all-build-bison
|
||||
|
|
@ -43346,7 +43291,6 @@ all-stage3-gcc: maybe-all-build-bison
|
|||
all-stage4-gcc: maybe-all-build-bison
|
||||
all-stageprofile-gcc: maybe-all-build-bison
|
||||
all-stagefeedback-gcc: maybe-all-build-bison
|
||||
all-prebootstrap: maybe-all-build-bison
|
||||
all-gcc: maybe-all-build-byacc
|
||||
|
||||
all-stage1-gcc: maybe-all-build-byacc
|
||||
|
|
@ -43355,7 +43299,6 @@ all-stage3-gcc: maybe-all-build-byacc
|
|||
all-stage4-gcc: maybe-all-build-byacc
|
||||
all-stageprofile-gcc: maybe-all-build-byacc
|
||||
all-stagefeedback-gcc: maybe-all-build-byacc
|
||||
all-prebootstrap: maybe-all-build-byacc
|
||||
all-gcc: maybe-all-build-flex
|
||||
|
||||
all-stage1-gcc: maybe-all-build-flex
|
||||
|
|
@ -43364,7 +43307,6 @@ all-stage3-gcc: maybe-all-build-flex
|
|||
all-stage4-gcc: maybe-all-build-flex
|
||||
all-stageprofile-gcc: maybe-all-build-flex
|
||||
all-stagefeedback-gcc: maybe-all-build-flex
|
||||
all-prebootstrap: maybe-all-build-flex
|
||||
all-gcc: maybe-all-build-libiberty
|
||||
|
||||
all-stage1-gcc: maybe-all-build-libiberty
|
||||
|
|
@ -43373,7 +43315,6 @@ all-stage3-gcc: maybe-all-build-libiberty
|
|||
all-stage4-gcc: maybe-all-build-libiberty
|
||||
all-stageprofile-gcc: maybe-all-build-libiberty
|
||||
all-stagefeedback-gcc: maybe-all-build-libiberty
|
||||
all-prebootstrap: maybe-all-build-libiberty
|
||||
all-gcc: maybe-all-build-fixincludes
|
||||
|
||||
all-stage1-gcc: maybe-all-build-fixincludes
|
||||
|
|
@ -43382,7 +43323,6 @@ all-stage3-gcc: maybe-all-build-fixincludes
|
|||
all-stage4-gcc: maybe-all-build-fixincludes
|
||||
all-stageprofile-gcc: maybe-all-build-fixincludes
|
||||
all-stagefeedback-gcc: maybe-all-build-fixincludes
|
||||
all-prebootstrap: maybe-all-build-fixincludes
|
||||
all-gcc: maybe-all-zlib
|
||||
|
||||
all-stage1-gcc: maybe-all-stage1-zlib
|
||||
|
|
@ -43538,7 +43478,6 @@ all-stage3-binutils: maybe-all-build-flex
|
|||
all-stage4-binutils: maybe-all-build-flex
|
||||
all-stageprofile-binutils: maybe-all-build-flex
|
||||
all-stagefeedback-binutils: maybe-all-build-flex
|
||||
all-prebootstrap: maybe-all-build-flex
|
||||
all-binutils: maybe-all-build-bison
|
||||
|
||||
all-stage1-binutils: maybe-all-build-bison
|
||||
|
|
@ -43547,7 +43486,6 @@ all-stage3-binutils: maybe-all-build-bison
|
|||
all-stage4-binutils: maybe-all-build-bison
|
||||
all-stageprofile-binutils: maybe-all-build-bison
|
||||
all-stagefeedback-binutils: maybe-all-build-bison
|
||||
all-prebootstrap: maybe-all-build-bison
|
||||
all-binutils: maybe-all-build-byacc
|
||||
|
||||
all-stage1-binutils: maybe-all-build-byacc
|
||||
|
|
@ -43556,7 +43494,6 @@ all-stage3-binutils: maybe-all-build-byacc
|
|||
all-stage4-binutils: maybe-all-build-byacc
|
||||
all-stageprofile-binutils: maybe-all-build-byacc
|
||||
all-stagefeedback-binutils: maybe-all-build-byacc
|
||||
all-prebootstrap: maybe-all-build-byacc
|
||||
all-binutils: maybe-all-intl
|
||||
|
||||
all-stage1-binutils: maybe-all-stage1-intl
|
||||
|
|
@ -43652,7 +43589,6 @@ all-stage3-ld: maybe-all-build-bison
|
|||
all-stage4-ld: maybe-all-build-bison
|
||||
all-stageprofile-ld: maybe-all-build-bison
|
||||
all-stagefeedback-ld: maybe-all-build-bison
|
||||
all-prebootstrap: maybe-all-build-bison
|
||||
all-ld: maybe-all-build-byacc
|
||||
|
||||
all-stage1-ld: maybe-all-build-byacc
|
||||
|
|
@ -43661,7 +43597,6 @@ all-stage3-ld: maybe-all-build-byacc
|
|||
all-stage4-ld: maybe-all-build-byacc
|
||||
all-stageprofile-ld: maybe-all-build-byacc
|
||||
all-stagefeedback-ld: maybe-all-build-byacc
|
||||
all-prebootstrap: maybe-all-build-byacc
|
||||
all-ld: maybe-all-build-flex
|
||||
|
||||
all-stage1-ld: maybe-all-build-flex
|
||||
|
|
@ -43670,7 +43605,6 @@ all-stage3-ld: maybe-all-build-flex
|
|||
all-stage4-ld: maybe-all-build-flex
|
||||
all-stageprofile-ld: maybe-all-build-flex
|
||||
all-stagefeedback-ld: maybe-all-build-flex
|
||||
all-prebootstrap: maybe-all-build-flex
|
||||
all-ld: maybe-all-intl
|
||||
|
||||
all-stage1-ld: maybe-all-stage1-intl
|
||||
|
|
@ -43799,22 +43733,6 @@ all-target-winsup: maybe-all-target-libiberty
|
|||
all-target-winsup: maybe-all-target-libtermcap
|
||||
|
||||
|
||||
# Non-toplevel bootstrap rules must depend on several packages, to be built
|
||||
# before gcc. Another wart that will go away, hopefully soon.
|
||||
@if gcc-no-bootstrap
|
||||
|
||||
all-prebootstrap: maybe-all-bfd
|
||||
all-prebootstrap: maybe-all-opcodes
|
||||
all-prebootstrap: maybe-all-binutils
|
||||
all-prebootstrap: maybe-all-gas
|
||||
all-prebootstrap: maybe-all-intl
|
||||
all-prebootstrap: maybe-all-ld
|
||||
all-prebootstrap: maybe-all-libcpp
|
||||
all-prebootstrap: maybe-all-libdecnumber
|
||||
all-prebootstrap: maybe-all-libiberty
|
||||
all-prebootstrap: maybe-all-zlib
|
||||
@endif gcc-no-bootstrap
|
||||
|
||||
CONFIGURE_GDB_TK = @CONFIGURE_GDB_TK@
|
||||
GDB_TK = @GDB_TK@
|
||||
INSTALL_GDB_TK = @INSTALL_GDB_TK@
|
||||
|
|
|
|||
66
Makefile.tpl
66
Makefile.tpl
|
|
@ -1115,60 +1115,6 @@ ENDIF raw_cxx +]
|
|||
# ----------
|
||||
|
||||
@if gcc-no-bootstrap
|
||||
# GCC has some more recursive targets, which trigger the old
|
||||
# (but still current, until the toplevel bootstrap project
|
||||
# is finished) compiler bootstrapping rules.
|
||||
|
||||
GCC_STRAP_TARGETS = bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap
|
||||
.PHONY: $(GCC_STRAP_TARGETS)
|
||||
$(GCC_STRAP_TARGETS): all-prebootstrap configure-gcc
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(HOST_EXPORTS) \
|
||||
echo "Bootstrapping the compiler"; \
|
||||
$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,:[ :]*,:,g;s,^[ :]*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
|
||||
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
case "$@" in \
|
||||
*bootstrap4-lean ) \
|
||||
msg="Comparing stage3 and stage4 of the compiler"; \
|
||||
compare=compare3-lean ;; \
|
||||
*bootstrap4 ) \
|
||||
msg="Comparing stage3 and stage4 of the compiler"; \
|
||||
compare=compare3 ;; \
|
||||
*-lean ) \
|
||||
msg="Comparing stage2 and stage3 of the compiler"; \
|
||||
compare=compare-lean ;; \
|
||||
* ) \
|
||||
msg="Comparing stage2 and stage3 of the compiler"; \
|
||||
compare=compare ;; \
|
||||
esac; \
|
||||
$(HOST_EXPORTS) \
|
||||
echo "$$msg"; \
|
||||
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
|
||||
echo "Building runtime libraries"; \
|
||||
$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
|
||||
|
||||
profiledbootstrap: all-prebootstrap configure-gcc
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(HOST_EXPORTS) \
|
||||
$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,:[ :]*,:,g;s,^[ :]*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
|
||||
echo "Bootstrapping training compiler"; \
|
||||
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stageprofile_build
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(HOST_EXPORTS) \
|
||||
echo "Building feedback based compiler"; \
|
||||
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stagefeedback_build
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
|
||||
echo "Building runtime libraries"; \
|
||||
$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
|
||||
|
||||
.PHONY: cross
|
||||
cross: all-build all-gas all-ld
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
|
|
@ -1554,7 +1500,6 @@ configure-target-[+module+]: maybe-all-target-newlib maybe-all-target-libgloss
|
|||
+][+ FOR bootstrap_stage +]
|
||||
[+ (make-dep (dep-stage) "") +][+
|
||||
ENDFOR bootstrap_stage +]
|
||||
all-prebootstrap: [+ (dep-target "" "on" (exist? "hard")) +]
|
||||
[+ == "bootstrap"
|
||||
+][+ FOR bootstrap_stage +]
|
||||
[+ (make-dep (dep-stage) (dep-stage)) +][+
|
||||
|
|
@ -1562,17 +1507,6 @@ all-prebootstrap: [+ (dep-target "" "on" (exist? "hard")) +]
|
|||
[+ ESAC +][+
|
||||
ENDFOR dependencies +]
|
||||
|
||||
# Non-toplevel bootstrap rules must depend on several packages, to be built
|
||||
# before gcc. Another wart that will go away, hopefully soon.
|
||||
@if gcc-no-bootstrap
|
||||
[+ FOR host_modules +][+
|
||||
IF (and (not (= (get "module") "gcc"))
|
||||
(hash-ref boot-modules (get "module"))) +]
|
||||
all-prebootstrap: maybe-all-[+module+][+
|
||||
ENDIF +][+
|
||||
ENDFOR host_modules +]
|
||||
@endif gcc-no-bootstrap
|
||||
|
||||
CONFIGURE_GDB_TK = @CONFIGURE_GDB_TK@
|
||||
GDB_TK = @GDB_TK@
|
||||
INSTALL_GDB_TK = @INSTALL_GDB_TK@
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2006-12-29 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
* acx.m4: Sync with gcc.
|
||||
|
||||
2006-12-04 Eric Botcazou <ebotcazou@libertysurf.fr>
|
||||
|
||||
* tls.m4 (GCC_CHECK_TLS): Do not test TLS with static linking
|
||||
|
|
|
|||
|
|
@ -488,4 +488,5 @@ else
|
|||
# We need a cross tool
|
||||
AC_MSG_RESULT(pre-installed)
|
||||
fi
|
||||
fi])
|
||||
fi
|
||||
AC_SUBST($2)])
|
||||
|
|
|
|||
127
configure.in
127
configure.in
|
|
@ -1117,14 +1117,22 @@ choke me
|
|||
if test x"$have_gmp" = xyes; then
|
||||
saved_LIBS="$LIBS"
|
||||
LIBS="$LIBS $gmplibs"
|
||||
dnl MPFR 2.2.0 is acceptable but buggy, MPFR 2.2.1 is better.
|
||||
AC_MSG_CHECKING([for correct version of mpfr.h])
|
||||
AC_TRY_LINK([#include <gmp.h>
|
||||
#include <mpfr.h>],[
|
||||
#if MPFR_VERSION_MAJOR < 2 || (MPFR_VERSION_MAJOR == 2 && MPFR_VERSION_MINOR < 2)
|
||||
#if MPFR_VERSION < MPFR_VERSION_NUM(2,2,0)
|
||||
choke me
|
||||
#endif
|
||||
mpfr_t n; mpfr_init(n);
|
||||
], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); have_gmp=no])
|
||||
], [AC_TRY_LINK([#include <gmp.h>
|
||||
#include <mpfr.h>],[
|
||||
#if MPFR_VERSION < MPFR_VERSION_NUM(2,2,1)
|
||||
choke me
|
||||
#endif
|
||||
mpfr_t n; mpfr_init(n);
|
||||
], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])])],
|
||||
[AC_MSG_RESULT([no]); have_gmp=no])
|
||||
LIBS="$saved_LIBS"
|
||||
fi
|
||||
CFLAGS="$saved_CFLAGS"
|
||||
|
|
@ -1145,8 +1153,7 @@ AC_SUBST(gmplibs)
|
|||
AC_SUBST(gmpinc)
|
||||
|
||||
# By default, C is the only stage 1 language.
|
||||
stage1_languages=c
|
||||
AC_SUBST(stage1_languages)
|
||||
stage1_languages=,c,
|
||||
|
||||
# Figure out what language subdirectories are present.
|
||||
# Look if the user specified --enable-languages="..."; if not, use
|
||||
|
|
@ -1208,9 +1215,9 @@ if test -d ${srcdir}/gcc; then
|
|||
esac
|
||||
done
|
||||
|
||||
new_enable_languages=c
|
||||
new_enable_languages=,c,
|
||||
missing_languages=`echo ",$enable_languages," | sed -e s/,all,/,/ -e s/,c,/,/ `
|
||||
potential_languages=c
|
||||
potential_languages=,c,
|
||||
|
||||
for lang_frag in ${srcdir}/gcc/*/config-lang.in .. ; do
|
||||
case ${lang_frag} in
|
||||
|
|
@ -1225,32 +1232,22 @@ if test -d ${srcdir}/gcc; then
|
|||
target_libs=
|
||||
lang_dirs=
|
||||
subdir_requires=
|
||||
boot_language=
|
||||
build_by_default=
|
||||
boot_language=no
|
||||
build_by_default=yes
|
||||
. ${lang_frag}
|
||||
potential_languages="${potential_languages},${language}"
|
||||
# This is quite sensitive to the ordering of the case statement arms.
|
||||
case ,${enable_languages},:${language}:${have_gnat}:${build_by_default} in
|
||||
*::*:*)
|
||||
echo "${lang_frag} doesn't set \$language." 1>&2
|
||||
exit 1
|
||||
;;
|
||||
*:ada:no:*)
|
||||
# Ada was requested with no preexisting GNAT. Disable unconditionally.
|
||||
add_this_lang=no
|
||||
;;
|
||||
*,${language},*:*:*:*)
|
||||
if test x${language} = x; then
|
||||
echo "${lang_frag} doesn't set \$language." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case ,${enable_languages}, in
|
||||
*,${language},*)
|
||||
# Language was explicitly selected; include it.
|
||||
add_this_lang=yes
|
||||
;;
|
||||
*,all,*:*:*:no)
|
||||
# 'all' was selected, but this is not a default language
|
||||
# so do not include it.
|
||||
add_this_lang=no
|
||||
;;
|
||||
*,all,*:*:*:*)
|
||||
# 'all' was selected and this is a default language; include it.
|
||||
add_this_lang=yes
|
||||
*,all,*)
|
||||
# 'all' was selected, select it if it is a default language
|
||||
add_this_lang=${build_by_default}
|
||||
;;
|
||||
*)
|
||||
add_this_lang=no
|
||||
|
|
@ -1267,30 +1264,48 @@ if test -d ${srcdir}/gcc; then
|
|||
;;
|
||||
*)
|
||||
# Silently disable.
|
||||
add_this_lang=no
|
||||
add_this_lang=unsupported
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# Disable Ada if no preexisting GNAT is available.
|
||||
case ,${enable_languages},:${language}:${have_gnat} in
|
||||
*,${language},*:ada:no)
|
||||
# Specifically requested language; tell them.
|
||||
AC_MSG_ERROR([GNAT is required to build $language])
|
||||
;;
|
||||
*:ada:no)
|
||||
# Silently disable.
|
||||
add_this_lang=unsupported
|
||||
;;
|
||||
esac
|
||||
|
||||
# Disable a language that is unsupported by the target.
|
||||
case " $unsupported_languages " in
|
||||
*" $language "*)
|
||||
add_this_lang=no
|
||||
add_this_lang=unsupported
|
||||
;;
|
||||
esac
|
||||
|
||||
case $add_this_lang in
|
||||
no)
|
||||
unsupported)
|
||||
# Remove language-dependent dirs.
|
||||
eval noconfigdirs='"$noconfigdirs "'\"$target_libs $lang_dirs\"
|
||||
;;
|
||||
*)
|
||||
new_enable_languages="$new_enable_languages,$language"
|
||||
no)
|
||||
# Remove language-dependent dirs; still show language as supported.
|
||||
eval noconfigdirs='"$noconfigdirs "'\"$target_libs $lang_dirs\"
|
||||
potential_languages="${potential_languages}${language},"
|
||||
;;
|
||||
yes)
|
||||
new_enable_languages="${new_enable_languages}${language},"
|
||||
potential_languages="${potential_languages}${language},"
|
||||
missing_languages=`echo "$missing_languages" | sed "s/,$language,/,/"`
|
||||
case ${boot_language} in
|
||||
yes)
|
||||
# Add to (comma-separated) list of stage 1 languages.
|
||||
stage1_languages="${stage1_languages},${language}"
|
||||
stage1_languages="${stage1_languages}${language},"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
|
@ -1299,17 +1314,55 @@ if test -d ${srcdir}/gcc; then
|
|||
esac
|
||||
done
|
||||
|
||||
AC_ARG_ENABLE(stage1-languages,
|
||||
[ --enable-stage1-languages[=all] choose additional languages to build during
|
||||
stage1. Mostly useful for compiler development.],
|
||||
[case ,${enable_stage1_languages}, in
|
||||
,no,|,,)
|
||||
# Set it to something that will have no effect in the loop below
|
||||
enable_stage1_languages=c ;;
|
||||
,yes,)
|
||||
enable_stage1_languages=`echo $new_enable_languages | \
|
||||
sed -e "s/^,//" -e "s/,$//" ` ;;
|
||||
*,all,*)
|
||||
enable_stage1_languages=`echo ,$enable_stage1_languages, | \
|
||||
sed -e "s/,all,/$new_enable_languages/" -e "s/^,//" -e "s/,$//" ` ;;
|
||||
esac
|
||||
|
||||
# Add "good" languages from enable_stage1_languages to stage1_languages,
|
||||
# while "bad" languages go in missing_languages. Leave no duplicates.
|
||||
for i in `echo $enable_stage1_languages | sed 's/,/ /g' `; do
|
||||
case $potential_languages in
|
||||
*,$i,*)
|
||||
case $stage1_languages in
|
||||
*,$i,*) ;;
|
||||
*) stage1_languages="$stage1_languages$i," ;;
|
||||
esac ;;
|
||||
*)
|
||||
case $missing_languages in
|
||||
*,$i,*) ;;
|
||||
*) missing_languages="$missing_languages$i," ;;
|
||||
esac ;;
|
||||
esac
|
||||
done])
|
||||
|
||||
# Remove leading/trailing commas that were added for simplicity
|
||||
potential_languages=`echo "$potential_languages" | sed -e "s/^,//" -e "s/,$//"`
|
||||
missing_languages=`echo "$missing_languages" | sed -e "s/^,//" -e "s/,$//"`
|
||||
stage1_languages=`echo "$stage1_languages" | sed -e "s/^,//" -e "s/,$//"`
|
||||
new_enable_languages=`echo "$new_enable_languages" | sed -e "s/^,//" -e "s/,$//"`
|
||||
|
||||
if test "x$missing_languages" != x; then
|
||||
AC_MSG_ERROR([
|
||||
The following requested languages could not be built: ${missing_languages}
|
||||
Recognised languages are: ${potential_languages}])
|
||||
Supported languages are: ${potential_languages}])
|
||||
fi
|
||||
|
||||
if test "x$new_enable_languages" != "x$enable_languages"; then
|
||||
echo The following languages will be built: ${new_enable_languages}
|
||||
enable_languages="$new_enable_languages"
|
||||
fi
|
||||
enable_languages="$new_enable_languages"
|
||||
|
||||
AC_SUBST(stage1_languages)
|
||||
ac_configure_args=`echo " $ac_configure_args" | sed -e 's/ --enable-languages=[[^ ]]*//' -e 's/$/ --enable-languages='"$enable_languages"/ `
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue