From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 73746 invoked by alias); 1 Apr 2015 17:33:25 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 73699 invoked by uid 89); 1 Apr 2015 17:33:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL,BAYES_00,NO_DNS_FOR_FROM,T_RP_MATCHES_RCVD autolearn=no version=3.3.2 X-HELO: mga03.intel.com Received: from mga03.intel.com (HELO mga03.intel.com) (134.134.136.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 01 Apr 2015 17:33:18 +0000 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP; 01 Apr 2015 10:33:16 -0700 X-ExtLoop1: 1 Received: from gnu-6.sc.intel.com ([172.25.70.52]) by FMSMGA003.fm.intel.com with ESMTP; 01 Apr 2015 10:33:16 -0700 Received: by gnu-6.sc.intel.com (Postfix, from userid 1000) id 82904200BB9; Wed, 1 Apr 2015 10:33:15 -0700 (PDT) Date: Wed, 01 Apr 2015 17:33:00 -0000 From: "H.J. Lu" To: GDB Subject: [committed, PATCH] Fix sim build Message-ID: <20150401173315.GA2820@intel.com> Reply-To: "H.J. Lu" MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-SW-Source: 2015-04/txt/msg00069.txt.bz2 I checked in this patch to fix sim build. H.J. * 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). --- sim/ChangeLog | 9 +++++++++ sim/common/Make-common.in | 7 +++---- 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 + * 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 + * 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@ -- 1.9.3