summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.def1
-rw-r--r--Makefile.in8
3 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ef6a7ad0c0..1d18dbcda9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-07-14 Hans-Peter Nilsson <hp@bitrange.com>
+
+ Sync with src:
+ 2015-03-30 H.J. Lu <hongjiu.lu@intel.com>
+ * Makefile.def (dependencies): Add all-zlib to all-bfd.
+ * Makefile.in: Regenerated.
+
2015-06-30 H.J. Lu <hongjiu.lu@intel.com>
* configure.ac (ospace_frag): Enable for i?86*-*-elfiamcu
diff --git a/Makefile.def b/Makefile.def
index e0ea2fbe712..4e7645092dd 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 24f51a413c1..fd5d6fa90c8 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