diff --git a/ChangeLog b/ChangeLog index 5ef6a7ad0c0b1..1d18dbcda9ce4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-07-14 Hans-Peter Nilsson + + Sync with src: + 2015-03-30 H.J. Lu + * Makefile.def (dependencies): Add all-zlib to all-bfd. + * Makefile.in: Regenerated. + 2015-06-30 H.J. Lu * configure.ac (ospace_frag): Enable for i?86*-*-elfiamcu diff --git a/Makefile.def b/Makefile.def index e0ea2fbe71238..4e7645092ddb1 100644 --- a/Makefile.def +++ b/Makefile.def @@ -402,6 +402,7 @@ dependencies = { module=configure-bfd; on=configure-libiberty; hard=true; }; dependencies = { module=configure-bfd; on=configure-intl; }; dependencies = { module=all-bfd; on=all-libiberty; }; dependencies = { module=all-bfd; on=all-intl; }; +dependencies = { module=all-bfd; on=all-zlib; }; dependencies = { module=configure-opcodes; on=configure-libiberty; hard=true; }; dependencies = { module=all-opcodes; on=all-libiberty; }; diff --git a/Makefile.in b/Makefile.in index 24f51a413c1cf..fd5d6fa90c8bc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -49977,6 +49977,14 @@ all-stage3-bfd: maybe-all-stage3-intl all-stage4-bfd: maybe-all-stage4-intl all-stageprofile-bfd: maybe-all-stageprofile-intl all-stagefeedback-bfd: maybe-all-stagefeedback-intl +all-bfd: maybe-all-zlib + +all-stage1-bfd: maybe-all-stage1-zlib +all-stage2-bfd: maybe-all-stage2-zlib +all-stage3-bfd: maybe-all-stage3-zlib +all-stage4-bfd: maybe-all-stage4-zlib +all-stageprofile-bfd: maybe-all-stageprofile-zlib +all-stagefeedback-bfd: maybe-all-stagefeedback-zlib configure-opcodes: configure-libiberty configure-stage1-opcodes: configure-stage1-libiberty