* config/rs6000.mh (MH_CFLAGS): Circumvent IBM <rpc/rpc.h> bug,

for files in vx-share/*.c.
* xm-rs6000.h (fd_set):  Circumvent the rs6000.mh circumvention,
for normal GDB source files.
This commit is contained in:
John Gilmore 1992-09-03 00:55:04 +00:00
parent 6d7bfa9a44
commit 82eabd43a8
3 changed files with 30 additions and 2 deletions

View file

@ -1,5 +1,10 @@
Wed Sep 2 13:45:27 1992 John Gilmore (gnu@cygnus.com)
* config/rs6000.mh (MH_CFLAGS): Circumvent IBM <rpc/rpc.h> bug,
for files in vx-share/*.c.
* xm-rs6000.h (fd_set): Circumvent the rs6000.mh circumvention,
for normal GDB source files.
* Makefile.in (VERSION): Roll to 4.6.6.
* tm-vx68.h, tm-es1800.h: Use tm-68k.h rather than tm-sun3.h.

View file

@ -19,9 +19,19 @@
XDEPFILES= infptrace.o rs6000-xdep.o
XM_FILE= xm-rs6000.h
# Prevent gcc from being confused. This actually belongs in CC...
# When compiled with cc, for debugging, this argument should be passed.
# We have no idea who our current compiler is though, so we skip it.
# MH_CFLAGS = -bnodelcsect
# The IBM version of /usr/include/rpc/rpc.h has a bug -- it says
# `extern fd_set svc_fdset;' without ever defining the type fd_set.
# Unfortunately this occurs in the vx-share code, which is not configured
# like the rest of GDB (e.g. it doesn't include "defs.h").
# We circumvent this bug by #define-ing fd_set here, but undefining it in
# the xm-rs6000.h file before ordinary modules try to use it. FIXME, IBM!
MH_CFLAGS=-Dfd_set=int
# Because of shared libraries, we risk ending up with *two*
# incompatible versions of malloc if we use GNU malloc ...
MMALLOC_LIB =

View file

@ -1,5 +1,5 @@
/* Parameters for hosting on an RS6000, for GDB, the GNU debugger.
Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
Copyright 1986, 1987, 1989, 1991, 1992 Free Software Foundation, Inc.
Contributed by IBM Corporation.
This file is part of GDB.
@ -18,6 +18,19 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
/* The following text is taken from config/rs6000.mh:
* # The IBM version of /usr/include/rpc/rpc.h has a bug -- it says
* # `extern fd_set svc_fdset;' without ever defining the type fd_set.
* # Unfortunately this occurs in the vx-share code, which is not configured
* # like the rest of GDB (e.g. it doesn't include "defs.h").
* # We circumvent this bug by #define-ing fd_set here, but undefining it in
* # the xm-rs6000.h file before ordinary modules try to use it. FIXME, IBM!
* MH_CFLAGS='-Dfd_set=int'
* So, here we do the undefine...which has to occur before we include
* <sys/select.h> below.
*/
#undef fd_set
#include <sys/select.h>
#include <sys/ptrace.h>