Sync with gcc:
* Makefile.def (target_modules): Add libgcc. (lang_env_dependencies): Remove default items. Use no_c and no_gcc. * Makefile.tpl (clean-target-libgcc): Delete. (configure-target-[+module+]): Emit --disable-bootstrap dependencies on gcc even for bootstrapped modules. Rewrite handling of lang_env_dependencies to loop over target_modules. * configure.in (target_libraries): Add target-libgcc. * Makefile.in, configure: Regenerated.
This commit is contained in:
Daniel Jacobowitz
parent
ef2874e06c
commit
6aa8ef8295
11
ChangeLog
11
ChangeLog
@ -1,3 +1,14 @@
|
||||
2007-01-03 Daniel Jacobowitz <dan@codesourcery.com>
|
||||
|
||||
* Makefile.def (target_modules): Add libgcc.
|
||||
(lang_env_dependencies): Remove default items. Use no_c and no_gcc.
|
||||
* Makefile.tpl (clean-target-libgcc): Delete.
|
||||
(configure-target-[+module+]): Emit --disable-bootstrap dependencies
|
||||
on gcc even for bootstrapped modules. Rewrite handling of
|
||||
lang_env_dependencies to loop over target_modules.
|
||||
* configure.in (target_libraries): Add target-libgcc.
|
||||
* Makefile.in, configure: Regenerated.
|
||||
|
||||
2006-12-29 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
Sync with gcc:
|
||||
|
||||
20
Makefile.def
20
Makefile.def
@ -119,6 +119,7 @@ target_modules = { module= libstdc++-v3; lib_path=.libs; raw_cxx=true; };
|
||||
target_modules = { module= libmudflap; lib_path=.libs; };
|
||||
target_modules = { module= libssp; lib_path=.libs; };
|
||||
target_modules = { module= newlib; };
|
||||
target_modules = { module= libgcc; bootstrap=true; no_check=true; };
|
||||
target_modules = { module= libgfortran; };
|
||||
target_modules = { module= libobjc; };
|
||||
target_modules = { module= libtermcap; no_check=true;
|
||||
@ -439,18 +440,17 @@ dependencies = { module=all-tar; on=all-build-texinfo; };
|
||||
dependencies = { module=all-uudecode; on=all-build-texinfo; };
|
||||
|
||||
// Target modules. These can also have dependencies on the language
|
||||
// environment (e.g. on libstdc++).
|
||||
lang_env_dependencies = { module=boehm-gc; };
|
||||
// environment (e.g. on libstdc++). By default target modules depend
|
||||
// on libgcc and newlib/libgloss.
|
||||
lang_env_dependencies = { module=gperf; cxx=true; };
|
||||
lang_env_dependencies = { module=libada; };
|
||||
lang_env_dependencies = { module=libgfortran; };
|
||||
lang_env_dependencies = { module=libffi; };
|
||||
lang_env_dependencies = { module=libjava; cxx=true; };
|
||||
lang_env_dependencies = { module=libmudflap; };
|
||||
lang_env_dependencies = { module=libobjc; };
|
||||
lang_env_dependencies = { module=libssp; };
|
||||
lang_env_dependencies = { module=libstdc++-v3; };
|
||||
lang_env_dependencies = { module=zlib; };
|
||||
lang_env_dependencies = { module=newlib; no_c=true; };
|
||||
lang_env_dependencies = { module=libgloss; no_c=true; };
|
||||
lang_env_dependencies = { module=libgcc; no_gcc=true; no_c=true; };
|
||||
// libiberty does not depend on newlib or libgloss because it must be
|
||||
// built newlib on some targets (e.g. Cygwin). It still needs
|
||||
// a dependency on libgcc for native targets to configure.
|
||||
lang_env_dependencies = { module=libiberty; no_c=true; };
|
||||
|
||||
dependencies = { module=configure-target-boehm-gc; on=configure-target-qthreads; };
|
||||
dependencies = { module=configure-target-fastjar; on=configure-target-zlib; };
|
||||
|
||||
990
Makefile.in
990
Makefile.in
File diff suppressed because it is too large
Load Diff
57
Makefile.tpl
57
Makefile.tpl
@ -611,11 +611,6 @@ maintainer-clean: local-maintainer-clean do-maintainer-clean local-clean
|
||||
maintainer-clean: local-distclean
|
||||
realclean: maintainer-clean
|
||||
|
||||
# Extra dependency for clean-target, owing to the mixed nature of gcc.
|
||||
clean-target: clean-target-libgcc
|
||||
clean-target-libgcc:
|
||||
if test -f gcc/Makefile; then cd gcc && $(MAKE) $@; else :; fi
|
||||
|
||||
# Check target.
|
||||
|
||||
.PHONY: check do-check
|
||||
@ -1400,18 +1395,12 @@ configure-target-[+module+]: stage_last[+
|
||||
ENDIF bootstrap +][+ ENDFOR target_modules +]
|
||||
@endif gcc-bootstrap
|
||||
|
||||
@if gcc-no-bootstrap[+ FOR target_modules +][+ IF bootstrap
|
||||
+][+ ELSE +]
|
||||
@if gcc-no-bootstrap[+ FOR target_modules +]
|
||||
configure-target-[+module+]: maybe-all-gcc[+
|
||||
ENDIF bootstrap +][+ ENDFOR target_modules +]
|
||||
ENDFOR target_modules +]
|
||||
@endif gcc-no-bootstrap
|
||||
|
||||
|
||||
[+ FOR lang_env_dependencies +]
|
||||
configure-target-[+module+]: maybe-all-target-newlib maybe-all-target-libgloss
|
||||
[+ IF cxx +]configure-target-[+module+]: maybe-all-target-libstdc++-v3
|
||||
[+ ENDIF cxx +][+ ENDFOR lang_env_dependencies +]
|
||||
|
||||
# There are two types of dependencies here: 'hard' dependencies, where one
|
||||
# module simply won't build without the other; and 'soft' dependencies, where
|
||||
# if the depended-on module is missing, the depending module will do without
|
||||
@ -1507,6 +1496,48 @@ configure-target-[+module+]: maybe-all-target-newlib maybe-all-target-libgloss
|
||||
[+ ESAC +][+
|
||||
ENDFOR dependencies +]
|
||||
|
||||
# Dependencies for target modules on other target modules are
|
||||
# described by lang_env_dependencies; the defaults apply to anything
|
||||
# not mentioned there.
|
||||
[+
|
||||
;; Predicate for whether LANG was specified in lang_env_dependencies.
|
||||
(define lang-dep (lambda (lang)
|
||||
(hash-ref lang-env-deps (string-append (get "module") "-" lang))))
|
||||
|
||||
;; Build the hash table we will need.
|
||||
(define lang-env-deps (make-hash-table 7))
|
||||
+][+ FOR lang_env_dependencies +][+
|
||||
(if (exist? "cxx")
|
||||
(hash-create-handle! lang-env-deps
|
||||
(string-append (get "module") "-" "cxx") #t))
|
||||
|
||||
(if (exist? "no_c")
|
||||
(hash-create-handle! lang-env-deps
|
||||
(string-append (get "module") "-" "no_c") #t))
|
||||
|
||||
(if (exist? "no_gcc")
|
||||
(hash-create-handle! lang-env-deps
|
||||
(string-append (get "module") "-" "no_gcc") #t))
|
||||
"" +][+ ENDFOR lang_env_dependencies +]
|
||||
|
||||
@if gcc-bootstrap[+ FOR target_modules +][+ IF (not (lang-dep "no_gcc"))
|
||||
+][+ IF bootstrap +][+ FOR bootstrap_stage +]
|
||||
configure-stage[+id+]-target-[+module+]: maybe-all-stage[+id+]-target-libgcc[+
|
||||
ENDFOR +][+ ENDIF bootstrap +][+ ENDIF +][+ ENDFOR target_modules +]
|
||||
@endif gcc-bootstrap
|
||||
|
||||
@if gcc-no-bootstrap[+ FOR target_modules +][+ IF (not (lang-dep "no_gcc")) +]
|
||||
configure-target-[+module+]: maybe-all-target-libgcc[+
|
||||
ENDIF +][+ ENDFOR target_modules +]
|
||||
@endif gcc-no-bootstrap
|
||||
|
||||
[+ FOR target_modules +][+ IF (not (lang-dep "no_c")) +]
|
||||
configure-target-[+module+]: maybe-all-target-newlib maybe-all-target-libgloss[+
|
||||
ENDIF +][+ IF (lang-dep "cxx") +]
|
||||
configure-target-[+module+]: maybe-all-target-libstdc++-v3[+
|
||||
ENDIF +]
|
||||
[+ ENDFOR target_modules +]
|
||||
|
||||
CONFIGURE_GDB_TK = @CONFIGURE_GDB_TK@
|
||||
GDB_TK = @GDB_TK@
|
||||
INSTALL_GDB_TK = @INSTALL_GDB_TK@
|
||||
|
||||
@ -142,6 +142,7 @@ libgcj="target-libffi \
|
||||
# the host libraries and the host tools (which may be a cross compiler)
|
||||
#
|
||||
target_libraries="target-libiberty \
|
||||
target-libgcc \
|
||||
target-libgloss \
|
||||
target-newlib \
|
||||
target-libstdc++-v3 \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user