From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30004 invoked by alias); 3 Dec 2011 18:34:01 -0000 Received: (qmail 29995 invoked by uid 22791); 3 Dec 2011 18:34:00 -0000 X-SWARE-Spam-Status: No, hits=-7.2 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 03 Dec 2011 18:33:45 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id pB3IXi5T004608 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 3 Dec 2011 13:33:44 -0500 Received: from host2.jankratochvil.net (ovpn-116-69.ams2.redhat.com [10.36.116.69]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id pB3IXYag000649 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sat, 3 Dec 2011 13:33:39 -0500 Date: Sat, 03 Dec 2011 18:34:00 -0000 From: Jan Kratochvil To: Doug Evans Cc: gdb-patches@sourceware.org Subject: [commit] Fix compilation --without-expat [Re: [commit] [patch] Implement qXfer:libraries-svr4 for Linux/gdbserver #4] Message-ID: <20111203183333.GA15275@host2.jankratochvil.net> References: <20111003215530.GC20272@host1.jankratochvil.net> <201110062009.24796.pedro@codesourcery.com> <20111021094258.GA23101@host1.jankratochvil.net> <201110211205.06852.pedro@codesourcery.com> <20111103213010.GA2480@host1.jankratochvil.net> <20111202223217.GA32698@host2.jankratochvil.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes 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 X-SW-Source: 2011-12/txt/msg00075.txt.bz2 On Sat, 03 Dec 2011 18:03:26 +0100, Doug Evans wrote: > I happened to do a non-expat build and got a build failure. > > ../../../src/gdb/solib-svr4.c:1293: error: 'svr4_free_library_list' undeclared (first use in this function) Checked in. Sorry, Jan http://sourceware.org/ml/gdb-cvs/2011-12/msg00019.html --- src/gdb/ChangeLog 2011/12/02 22:26:50 1.13569 +++ src/gdb/ChangeLog 2011/12/03 18:32:28 1.13570 @@ -1,3 +1,10 @@ +2011-12-03 Jan Kratochvil + + Fix compilation --without-expat. + * solib-svr4.c (svr4_free_so, svr4_free_library_list): Move them here + from ... + [HAVE_LIBEXPAT] (svr4_free_so, svr4_free_library_list): ... here. + 2011-12-02 Paul Pluzhnikov Jan Kratochvil --- src/gdb/solib-svr4.c 2011/12/02 22:26:51 1.159 +++ src/gdb/solib-svr4.c 2011/12/03 18:32:29 1.160 @@ -961,6 +961,30 @@ CORE_ADDR main_lm; }; +/* Implementation for target_so_ops.free_so. */ + +static void +svr4_free_so (struct so_list *so) +{ + xfree (so->lm_info); +} + +/* Free so_list built so far (called via cleanup). */ + +static void +svr4_free_library_list (void *p_list) +{ + struct so_list *list = *(struct so_list **) p_list; + + while (list != NULL) + { + struct so_list *next = list->next; + + svr4_free_so (list); + list = next; + } +} + #ifdef HAVE_LIBEXPAT #include "xml-support.h" @@ -1050,30 +1074,6 @@ { NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL } }; -/* Implementation for target_so_ops.free_so. */ - -static void -svr4_free_so (struct so_list *so) -{ - xfree (so->lm_info); -} - -/* Free so_list built so far (called via cleanup). */ - -static void -svr4_free_library_list (void *p_list) -{ - struct so_list *list = *(struct so_list **) p_list; - - while (list != NULL) - { - struct so_list *next = list->next; - - svr4_free_so (list); - list = next; - } -} - /* Parse qXfer:libraries:read packet into *SO_LIST_RETURN. Return 1 if Return 0 if packet not supported, *SO_LIST_RETURN is not modified in such