Because -lcompat defines the same symbols as -lgnuregex and the weakness

of the linker to enforce linking of modules in command line order it is
not possible to link gdb shared with -lcompat.

*HACK ALERT*
Removed -lcompat from LDADD and bring in the necessary functions out of
libcompat as a source module until the linker can be fixed.
This commit is contained in:
Nate Williams 1995-04-07 05:13:26 +00:00
parent 7e613ac7bd
commit 5a5755a556
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=7653
3 changed files with 65 additions and 8 deletions

View File

@ -17,7 +17,7 @@ SRCS = annotate.c blockframe.c breakpoint.c buildsym.c c-lang.c \
symtab.c target.c thread.c top.c \
typeprint.c utils.c valarith.c valops.c \
valprint.c values.c version.c serial.c ser-unix.c mdebugread.c\
c-exp.tab.c ch-exp.tab.c m2-exp.tab.c
c-exp.tab.c ch-exp.tab.c m2-exp.tab.c compat_que.c
c-exp.tab.c: $(.CURDIR)/c-exp.y
yacc -d -p c_ $(.CURDIR)/c-exp.y
@ -72,7 +72,4 @@ LDADD+= -L${.CURDIR}/../mmalloc/ -lmmalloc
DPADD+= ${.CURDIR}/../mmalloc/libmmalloc.a
.endif
LDADD+= -lcompat
DPADD+= ${LIBCOMPAT}
.include <bsd.prog.mk>

View File

@ -17,7 +17,7 @@ SRCS = annotate.c blockframe.c breakpoint.c buildsym.c c-lang.c \
symtab.c target.c thread.c top.c \
typeprint.c utils.c valarith.c valops.c \
valprint.c values.c version.c serial.c ser-unix.c mdebugread.c\
c-exp.tab.c ch-exp.tab.c m2-exp.tab.c
c-exp.tab.c ch-exp.tab.c m2-exp.tab.c compat_que.c
c-exp.tab.c: $(.CURDIR)/c-exp.y
yacc -d -p c_ $(.CURDIR)/c-exp.y
@ -72,7 +72,4 @@ LDADD+= -L${.CURDIR}/../mmalloc/ -lmmalloc
DPADD+= ${.CURDIR}/../mmalloc/libmmalloc.a
.endif
LDADD+= -lcompat
DPADD+= ${LIBCOMPAT}
.include <bsd.prog.mk>

View File

@ -0,0 +1,63 @@
/*
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)compat_que.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
/*
* insque/remque -- vax insque instruction
*
* NOTE: this implementation is non-atomic!!
*/
struct vaxque { /* queue format expected by VAX queue instructions */
struct vaxque *vq_next;
struct vaxque *vq_prev;
};
insque(e, prev)
register struct vaxque *e, *prev;
{
e->vq_prev = prev;
e->vq_next = prev->vq_next;
prev->vq_next->vq_prev = e;
prev->vq_next = e;
}
remque(e)
register struct vaxque *e;
{
e->vq_prev->vq_next = e->vq_next;
e->vq_next->vq_prev = e->vq_prev;
}