--- a/zlib/ChangeLog.gcj	Thu Oct 25 07:37:49 2018 +0900
+++ b/zlib/ChangeLog.gcj	Thu Feb 13 11:34:05 2020 +0900
@@ -1,3 +1,36 @@
+2020-01-24  Maciej W. Rozycki  <macro@wdc.com>
+
+	* configure.ac: Handle `--with-toolexeclibdir='.
+	* Makefile.in: Regenerate.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+
+2019-09-27  Maciej W. Rozycki  <macro@wdc.com>
+
+	* configure: Regenerate.
+
+2019-01-21  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* Makefile.am (noinst_LTLIBRARIES): Rename libzgcj_convience.la to
+	libz_convenience.la.
+	* Makefile.in: Regenerate.
+	* configure.ac: Remove target_all.
+	* configure: Regenerate.
+
+2018-10-31  Joseph Myers  <joseph@codesourcery.com>
+
+	PR bootstrap/82856
+	* Makefile.am: Include multilib.am.
+
+	Merge from binutils-gdb:
+	2018-06-19  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* configure.ac: Modernize AC_INIT call, remove AC_PREREQ.
+	* Makefile.am (AUTOMAKE_OPTIONS): Remove 1.8, cygnus, add foreign.
+	* Makefile.in: Re-generate.
+	* aclocal.m4: Re-generate.
+	* configure: Re-generate.
+
 2017-03-15  Yaakov Selkowitz <yselkowitz@redhat.com>
 
 	PR bootstrap/79771