diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2015-04-01 10:27:34 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2015-04-01 10:27:43 -0700 |
| commit | 79730a3b2683dba745663fa3b907f564bee8a0ef (patch) | |
| tree | 442859957650b75ec59b2542a614fdfe69eb3f72 | |
| parent | 0ceaf1ec964f8674c57c6a522cb38b6f758a0929 (diff) | |
| download | fsf-binutils-gdb-79730a3b2683dba745663fa3b907f564bee8a0ef.zip fsf-binutils-gdb-79730a3b2683dba745663fa3b907f564bee8a0ef.tar.gz fsf-binutils-gdb-79730a3b2683dba745663fa3b907f564bee8a0ef.tar.bz2 | |
Fix sim build
* common/Make-common.in (CSEARCH): Remove $(ZLIBINC).
(BFD_LIB): Remove $(ZLIB).
(CONFIG_LIBS): Add $(ZLIB).
* ppc/Makefile.in (ZLIBINC): Removed.
(INCLUDES): Remove $(ZLIBINC).
(BFD_LIB): Remove $(ZLIB).
| -rw-r--r-- | sim/ChangeLog | 9 | ||||
| -rw-r--r-- | sim/common/Make-common.in | 7 | ||||
| -rw-r--r-- | sim/ppc/Makefile.in | 10 |
3 files changed, 14 insertions, 12 deletions
diff --git a/sim/ChangeLog b/sim/ChangeLog index c755273..abbeccf 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,5 +1,14 @@ 2015-04-01 H.J. Lu <hongjiu.lu@intel.com> + * common/Make-common.in (CSEARCH): Remove $(ZLIBINC). + (BFD_LIB): Remove $(ZLIB). + (CONFIG_LIBS): Add $(ZLIB). + * ppc/Makefile.in (ZLIBINC): Removed. + (INCLUDES): Remove $(ZLIBINC). + (BFD_LIB): Remove $(ZLIB). + +2015-04-01 H.J. Lu <hongjiu.lu@intel.com> + * arm/configure: Regenerated. * avr/configure: Likewise. * bfin/configure: Likewise. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 345d1db..0b1f85a 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -248,21 +248,20 @@ CSEARCH = -I. -I$(srcdir) -I../common -I$(srccom) \ -I../../include -I$(srcroot)/include \ -I../../bfd -I$(srcroot)/bfd \ -I../../opcodes -I$(srcroot)/opcodes \ - @INCINTL@ $(ZLIBINC) + @INCINTL@ ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(CFLAGS) BUILD_CFLAGS = -g -O $(CSEARCH) COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) ZLIB = @zlibdir@ -lz -ZLIBINC = @zlibinc@ LIBIBERTY_LIB = ../../libiberty/libiberty.a -BFD_LIB = ../../bfd/libbfd.a $(ZLIB) +BFD_LIB = ../../bfd/libbfd.a @PLUGINS_TRUE@LIBDL = @lt_cv_dlopen_libs@ OPCODES_LIB = ../../opcodes/libopcodes.a LIBINTL = @LIBINTL@ LIBINTL_DEP = @LIBINTL_DEP@ -CONFIG_LIBS = @LIBS@ +CONFIG_LIBS = @LIBS@ $(ZLIB) LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL_DEP) $(LIBIBERTY_LIB) \ $(SIM_EXTRA_LIBDEPS) EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL) $(LIBIBERTY_LIB) \ diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index d3a9f16..964a7b3 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -152,19 +152,13 @@ MAKEOVERRIDES= LIB_INCLUDES = -I$(srcdir)/../../include BFD_INCLUDES = -I../../bfd -I$(srcdir)/../../bfd GDB_INCLUDES = -I../../gdb -I$(srcdir)/../../gdb -I$(srcdir)/../../gdb/config -ZLIBINC = @zlibinc@ -INCLUDES = -I. -I$(srcdir) $(LIB_INCLUDES) $(BFD_INCLUDES) $(GDB_INCLUDES) $(ZLIBINC) +INCLUDES = -I. -I$(srcdir) $(LIB_INCLUDES) $(BFD_INCLUDES) $(GDB_INCLUDES) LIBIBERTY_LIB = ../../libiberty/libiberty.a -BFD_LIB = ../../bfd/libbfd.a $(ZLIB) +BFD_LIB = ../../bfd/libbfd.a ZLIB = @zlibdir@ -lz -# 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 - LIBINTL = @LIBINTL@ LIBINTL_DEP = @LIBINTL_DEP@ INTL_CFLAGS = @INCINTL@ |