From owner-freebsd-current Mon Mar 20 22:56:09 1995 Return-Path: current-owner Received: (from majordom@localhost) by freefall.cdrom.com (8.6.10/8.6.6) id WAA02047 for current-outgoing; Mon, 20 Mar 1995 22:56:09 -0800 Received: from news.rim.or.jp (news.rim.or.jp [202.255.181.3]) by freefall.cdrom.com (8.6.10/8.6.6) with ESMTP id WAA02041 for ; Mon, 20 Mar 1995 22:56:05 -0800 Received: (from uucp@localhost) by news.rim.or.jp (8.6.10+2.4W/3.3W-rim1.0) with UUCP id PAA12593 for current@freebsd.org; Tue, 21 Mar 1995 15:56:01 +0900 Received: (from sa2c@localhost) by us.and.or.jp (8.6.11/3.3W8) id PAA09989; Tue, 21 Mar 1995 15:54:31 +0900 Date: Tue, 21 Mar 1995 15:54:31 +0900 From: NIIMI Satoshi Message-Id: <199503210654.PAA09989@us.and.or.jp> To: current@FreeBSD.org Subject: GDB on current Reply-to: sa2c@st.rim.or.jp Sender: current-owner@FreeBSD.org Precedence: bulk I've succeeded to make gdb with current ld. The solution is to put insque.o in libiberty.a. Although I pull back libiberty/insque.c from original gdb-4.1.3 (because gdb is already GDLed), to put .PATH: ${CURDIR}/../..(snip)../lib/libcompat/4.3 SRCS+= insque.c remque.c in libiberty/Makefile will work. The patch is below. --- /dev/null Tue Mar 21 14:06:31 1995 +++ libiberty/insque.c Tue Mar 21 14:22:45 1995 @@ -0,0 +1,73 @@ +/* insque(3C) routines + Copyright (C) 1991 Free Software Foundation, Inc. + +This file is part of the libiberty library. +Libiberty is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +Libiberty is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with libiberty; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +/* + +NAME + + insque, remque -- insert, remove an element from a queue + +SYNOPSIS + + struct qelem { + struct qelem *q_forw; + struct qelem *q_back; + char q_data[]; + }; + + void insque (struct qelem *elem, struct qelem *pred) + + void remque (struct qelem *elem) + +DESCRIPTION + + Routines to manipulate queues built from doubly linked lists. + The insque routine inserts ELEM in the queue immediately after + PRED. The remque routine removes ELEM from its containing queue. + +BUGS + +*/ + + +struct qelem { + struct qelem *q_forw; + struct qelem *q_back; +}; + + +void +insque (elem, pred) + struct qelem *elem; + struct qelem *pred; +{ + elem -> q_forw = pred -> q_forw; + pred -> q_forw -> q_back = elem; + elem -> q_back = pred; + pred -> q_forw = elem; +} + + +void +remque (elem) + struct qelem *elem; +{ + elem -> q_forw -> q_back = elem -> q_back; + elem -> q_back -> q_forw = elem -> q_forw; +} --- libiberty/Makefile.orig Tue Mar 21 14:25:55 1995 +++ libiberty/Makefile Tue Mar 21 14:24:08 1995 @@ -1,7 +1,7 @@ LIB= iberty SRCS= argv.c basename.c concat.c cplus-dem.c fdmatch.c getopt.c \ - getopt1.c ieee-float.c obstack.c spaces.c strerror.c strsignal.c \ - vasprintf.c xmalloc.c + getopt1.c ieee-float.c insque.c obstack.c spaces.c strerror.c \ + strsignal.c vasprintf.c xmalloc.c CFLAGS+= -I$(.CURDIR)/../gdb/. NOPROFILE=no --- gdb/Makefile.orig Tue Mar 21 14:26:40 1995 +++ gdb/Makefile Tue Mar 21 14:27:03 1995 @@ -72,7 +72,4 @@ DPADD+= ${.CURDIR}/../mmalloc/libmmalloc.a .endif -LDADD+= -lcompat -DPADD+= ${LIBCOMPAT} - .include -- 新見覚志 / NIIMI Satoshi