[binutils-gdb] PR27888, fix link of gas with zlib by libtool 2.4.6

[Alan Modra]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=d556135f02ae050fb1fad841e427e420d98dcfd5

commit d556135f02ae050fb1fad841e427e420d98dcfd5
Author: Nicolas Boulenguez <nicolas@debian.org>
Date:   Thu May 20 09:58:51 2021 +0930

    PR27888, fix link of gas with zlib by libtool 2.4.6
    
            PR 27888
            * Makefile.am (ZLIB): Define.
            (as_new_LDADD): Add it.
            * Makefile.in: Regenerate.

Diff:
---
 gas/ChangeLog   | 7 +++++++
 gas/Makefile.am | 3 ++-
 gas/Makefile.in | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index e12b93cc8f5..75eb501cf7b 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2021-05-20  Nicolas Boulenguez  <nicolas@debian.org>
+
+	PR 27888
+	* Makefile.am (ZLIB): Define.
+	(as_new_LDADD): Add it.
+	* Makefile.in: Regenerate.
+
 2021-05-17  Alex Coplan  <alex.coplan@arm.com>
 
 	* config/tc-arm.c (do_mve_mov): Only reject vmov if we're moving
diff --git a/gas/Makefile.am b/gas/Makefile.am
index fdce608d64f..34190e78b8c 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -27,6 +27,7 @@ tooldir = $(exec_prefix)/$(target_alias)
 # This is where we get zlib from.  zlibdir is -L../zlib and zlibinc is
 # -I../zlib, unless we were configured with --with-system-zlib, in which
 # case both are empty.
+ZLIB = @zlibdir@ -lz
 ZLIBINC = @zlibinc@
 
 YACC = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo @YACC@ ; fi`
@@ -404,7 +405,7 @@ STAGESTUFF = *.@OBJEXT@ $(noinst_PROGRAMS)
 
 as_new_SOURCES = $(GAS_CFILES)
 as_new_LDADD = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \
-	$(extra_objects) $(GASLIBS) $(LIBINTL) $(LIBM)
+	$(extra_objects) $(GASLIBS) $(LIBINTL) $(LIBM) $(ZLIB)
 as_new_DEPENDENCIES = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \
 	$(extra_objects) $(GASLIBS) $(LIBINTL_DEP)
 EXTRA_as_new_SOURCES = $(CFILES) $(HFILES) $(TARGET_CPU_CFILES) \
diff --git a/gas/Makefile.in b/gas/Makefile.in
index f4fa6935cbb..f3d66b8e8b6 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -427,6 +427,7 @@ tooldir = $(exec_prefix)/$(target_alias)
 # This is where we get zlib from.  zlibdir is -L../zlib and zlibinc is
 # -I../zlib, unless we were configured with --with-system-zlib, in which
 # case both are empty.
+ZLIB = @zlibdir@ -lz
 ZLIBINC = @zlibinc@
 
 # Automake 1.10+ disables lex and yacc output file regeneration if
@@ -783,7 +784,7 @@ GASLIBS = @OPCODES_LIB@ ../bfd/libbfd.la ../libiberty/libiberty.a
 STAGESTUFF = *.@OBJEXT@ $(noinst_PROGRAMS)
 as_new_SOURCES = $(GAS_CFILES)
 as_new_LDADD = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \
-	$(extra_objects) $(GASLIBS) $(LIBINTL) $(LIBM)
+	$(extra_objects) $(GASLIBS) $(LIBINTL) $(LIBM) $(ZLIB)
 
 as_new_DEPENDENCIES = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \
 	$(extra_objects) $(GASLIBS) $(LIBINTL_DEP)