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.
This commit is contained in:
Nicolas Boulenguez 2021-05-20 09:58:51 +09:30 committed by Alan Modra
parent 93b196f931
commit d556135f02
3 changed files with 11 additions and 2 deletions

View File

@ -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

View File

@ -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) \

View File

@ -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)