diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.def | 7 | ||||
| -rw-r--r-- | Makefile.in | 25 |
3 files changed, 37 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 7d6edd8d399..cd97c2602a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-01-08 Jan-Benedict Glaw <jbglaw@lug-owl.de> + + * Makefile.def: Merge from binutils. + * Makefile.in: Dito. + 2013-01-01 Maxim Kuvyrkov <maxim.kuvyrkov@gmail.com> * MAINTAINERS: Update my email. diff --git a/Makefile.def b/Makefile.def index 899ea2deee2..edf87b95f05 100644 --- a/Makefile.def +++ b/Makefile.def @@ -373,6 +373,9 @@ dependencies = { module=all-bfd; on=all-intl; }; dependencies = { module=configure-opcodes; on=configure-libiberty; hard=true; }; dependencies = { module=all-opcodes; on=all-libiberty; }; +// We must build gas before binutils, gprof, ld and gold to avoid race +// condition in the prev-gcc/as script during bootstrap of combined tree +// with GCC and binutils. See PR gas/14899 for details. dependencies = { module=configure-binutils; on=configure-intl; }; dependencies = { module=all-binutils; on=all-libiberty; }; dependencies = { module=all-binutils; on=all-opcodes; }; @@ -380,6 +383,7 @@ dependencies = { module=all-binutils; on=all-bfd; }; dependencies = { module=all-binutils; on=all-build-flex; }; dependencies = { module=all-binutils; on=all-build-bison; }; dependencies = { module=all-binutils; on=all-intl; }; +dependencies = { module=all-binutils; on=all-gas; }; // We put install-opcodes before install-binutils because the installed // binutils might be on PATH, and they might need the shared opcodes @@ -401,6 +405,7 @@ dependencies = { module=all-gprof; on=all-libiberty; }; dependencies = { module=all-gprof; on=all-bfd; }; dependencies = { module=all-gprof; on=all-opcodes; }; dependencies = { module=all-gprof; on=all-intl; }; +dependencies = { module=all-gprof; on=all-gas; }; dependencies = { module=configure-ld; on=configure-intl; }; dependencies = { module=all-ld; on=all-libiberty; }; dependencies = { module=all-ld; on=all-bfd; }; @@ -408,6 +413,7 @@ dependencies = { module=all-ld; on=all-opcodes; }; dependencies = { module=all-ld; on=all-build-bison; }; dependencies = { module=all-ld; on=all-build-flex; }; dependencies = { module=all-ld; on=all-intl; }; +dependencies = { module=all-ld; on=all-gas; }; dependencies = { module=install-ld; on=install-gold; }; dependencies = { module=install-strip-ld; on=install-strip-gold; }; dependencies = { module=configure-gold; on=configure-intl; }; @@ -415,6 +421,7 @@ dependencies = { module=all-gold; on=all-libiberty; }; dependencies = { module=all-gold; on=all-intl; }; dependencies = { module=all-gold; on=all-bfd; }; dependencies = { module=all-gold; on=all-build-bison; }; +dependencies = { module=all-gold; on=all-gas; }; dependencies = { module=check-gold; on=all-binutils; }; dependencies = { module=check-gold; on=all-gas; }; diff --git a/Makefile.in b/Makefile.in index ba5e041c0db..3e24047c080 100644 --- a/Makefile.in +++ b/Makefile.in @@ -45910,6 +45910,14 @@ all-stage3-binutils: maybe-all-stage3-intl all-stage4-binutils: maybe-all-stage4-intl all-stageprofile-binutils: maybe-all-stageprofile-intl all-stagefeedback-binutils: maybe-all-stagefeedback-intl +all-binutils: maybe-all-gas + +all-stage1-binutils: maybe-all-stage1-gas +all-stage2-binutils: maybe-all-stage2-gas +all-stage3-binutils: maybe-all-stage3-gas +all-stage4-binutils: maybe-all-stage4-gas +all-stageprofile-binutils: maybe-all-stageprofile-gas +all-stagefeedback-binutils: maybe-all-stagefeedback-gas install-binutils: maybe-install-opcodes install-strip-binutils: maybe-install-strip-opcodes install-opcodes: maybe-install-bfd @@ -45959,6 +45967,7 @@ all-gprof: maybe-all-libiberty all-gprof: maybe-all-bfd all-gprof: maybe-all-opcodes all-gprof: maybe-all-intl +all-gprof: maybe-all-gas configure-ld: maybe-configure-intl configure-stage1-ld: maybe-configure-stage1-intl @@ -46015,6 +46024,14 @@ all-stage3-ld: maybe-all-stage3-intl all-stage4-ld: maybe-all-stage4-intl all-stageprofile-ld: maybe-all-stageprofile-intl all-stagefeedback-ld: maybe-all-stagefeedback-intl +all-ld: maybe-all-gas + +all-stage1-ld: maybe-all-stage1-gas +all-stage2-ld: maybe-all-stage2-gas +all-stage3-ld: maybe-all-stage3-gas +all-stage4-ld: maybe-all-stage4-gas +all-stageprofile-ld: maybe-all-stageprofile-gas +all-stagefeedback-ld: maybe-all-stagefeedback-gas install-ld: maybe-install-gold install-strip-ld: maybe-install-strip-gold configure-gold: maybe-configure-intl @@ -46057,6 +46074,14 @@ all-stage3-gold: maybe-all-build-bison all-stage4-gold: maybe-all-build-bison all-stageprofile-gold: maybe-all-build-bison all-stagefeedback-gold: maybe-all-build-bison +all-gold: maybe-all-gas + +all-stage1-gold: maybe-all-stage1-gas +all-stage2-gold: maybe-all-stage2-gas +all-stage3-gold: maybe-all-stage3-gas +all-stage4-gold: maybe-all-stage4-gas +all-stageprofile-gold: maybe-all-stageprofile-gas +all-stagefeedback-gold: maybe-all-stagefeedback-gas check-gold: maybe-all-binutils check-stage1-gold: maybe-all-stage1-binutils |