* Makefile.in (MMALLOC_CFLAGS): Eliminate intermediate MMALLOC_DISABLE

	and MMALLOC_CHECK macros, and add comment indicating how host dependent
	makefile fragment should modify MMALLOC_CFLAGS to not use mmalloc, or
	to use it but to not do heap corruption checking.
	* gdbserver/Makefile.in: Ditto.
	* utils.c (init_malloc): Replace warning() use with direct call of
	fprintf_unfiltered, since current_target has not yet been set and thus
 	we cannot use warning().  If we try to use mmcheck and it fails,
	suggest that this configuration needs NO_MMCHECK or MMCHECK_FORCE
 	defined.  Other small mmalloc related cleanups.
	* config/sparc/sun4os4.mh (MMALLOC_CFLAGS): Define MMCHECK_FORCE to 1.
	* config/alpha/alpha-osf2.mh (MMALLOC_CFLAGS): Set to -DNO_MMCHECK.

	* config/sparc/xm-sun4os4.h (MMAP_BASE_ADDRESS, MMAP_INCREMENT):
	* config/i386/xm-i386v4.h (MMAP_BASE_ADDRESS, MMAP_INCREMENT):
	* config/i386/xm-linux.h (MMAP_BASE_ADDRESS, MMAP_INCREMENT):
	* config/m68k/xm-hp300hpux.h (MMAP_BASE_ADDRESS, MMAP_INCREMENT):
	* config/m68k/xm-m68kv4.h (MMAP_BASE_ADDRESS, MMAP_INCREMENT);
	* config/m68k/xm-sun3os4.h (MMAP_BASE_ADDRESS, MMAP_INCREMENT):
	* config/pa/xm-hppah.h (MMAP_BASE_ADDRESS, MMAP_INCREMENT):
	* config/sparc/xm-sun4sol2.h (MMAP_BASE_ADDRESS, MMAP_INCREMENT):
	Remove obsolete defines.

	* config/alpha/alpha-linux.mh (MMALLOC_DISABLE):
	* config/alpha/alpha-osf1.mh (MMALLOC_DISABLE):
	* config/rs6000/rs6000.mh (MMALLOC_DISABLE):
	* config/rs6000/aix4.mh (MMALLOC_DISABLE):
	* config/powerpc/aix4.mh (MMALLOC_DISABLE):
	* config/powerpc/aix.mh (MMALLOC_DISABLE):
	* config/ns32k/ns32km3.mh (MMALLOC_DISABLE):
	* config/mips/mipsm3.mh (MMALLOC_DISABLE):
	* config/mips/decstation.mh (MMALLOC_DISABLE):
	* config/m88k/cxux.mh (MMALLOC_DISABLE):
	* config/i386/i386mk.mh (MMALLOC_DISABLE):
	* config/i386/i386m3.mh (MMALLOC_DISABLE):
	* config/i386/i386gnu.mh (MMALLOC_DISABLE):
	Use MMALLOC_CFLAGS instead.

18 files changed, 54 insertions, 87 deletions

diff --git a/gdb/config/alpha/alpha-osf3.mh b/gdb/config/alpha/alpha-osf3.mh
new file mode 100644
index 0000000..0ee035b
--- /dev/null
+++ b/gdb/config/alpha/alpha-osf3.mh
@@ -0,0 +1,5 @@
+# Host: Little-endian Alpha running OSF/1-3.x and higher using procfs
+XDEPFILES= 
+XM_FILE= xm-alpha.h
+NAT_FILE= nm-osf3.h
+NATDEPFILES= infptrace.o inftarg.o corelow.o alpha-nat.o fork-child.o osfsolib.o procfs.o
diff --git a/gdb/config/i386/i386gnu.mh b/gdb/config/i386/i386gnu.mh
new file mode 100644
index 0000000..75cba98
--- /dev/null
+++ b/gdb/config/i386/i386gnu.mh
@@ -0,0 +1,36 @@
+# Host: Intel 386 running the GNU Hurd
+XDEPFILES= i387-tdep.o
+NATDEPFILES= i386gnu-nat.o gnu-nat.o fork-child.o solib.o notify_S.o process_reply_S.o msg_reply_S.o msg_U.o exc_request_U.o exc_request_S.o
+XM_FILE= xm-i386gnu.h
+NAT_FILE= nm-gnu.h
+
+# Use our own user stubs for the msg rpcs, so we can make them time out, in
+# case the program is fucked, or we guess the wrong signal thread.
+msg-MIGUFLAGS = -D'MSG_IMPORTS=waittime 1000;'
+
+# ick
+MIG = mig
+MIGCOM = $(MIG) -cc cat - /dev/null
+
+# Reply servers need special massaging of the code mig generates, to make
+# them work correctly for error returns in some cases.
+%_reply_S.h %_reply_S.c: %_reply.defs
+	$(CPP) $(CPPFLAGS) -DSERVERPREFIX=S_ -x c $< \
+	| $(MIGCOM) -sheader $*_reply_S.h -server $*_reply_S.raw -user /dev/null -header /dev/null \
+	&& $(AWK) -f $(srcdir)/reply_mig_hack.awk < $*_reply_S.raw > $*_reply_S.c
+# Normal servers
+%_S.h %_S.c: %.defs
+	$(CPP) $(CPPFLAGS) -DSERVERPREFIX=S_ -x c $< \
+	| $(MIGCOM) -sheader $*_S.h -server $*_S.c -user /dev/null -header /dev/null
+# User rpc stubs
+%_U.h %_U.c: %.defs
+	$(CPP) $(CPPFLAGS) $($*-MIGUFLAGS) -x c $< \
+	| $(MIGCOM) -sheader /dev/null -server /dev/null -user $*_U.c -header $*_U.h
+
+gnu-nat.o: process_reply_S.h exc_request_S.h notify_S.h msg_reply_S.h exc_request_U.h msg_U.h
+
+gnu-nat.o i386gnu-nat.o: gnu-nat.h
+
+# Don't use the mmalloc library in Mach 3.
+MMALLOC = 
+MMALLOC_CFLAGS = -DNO_MMALLOC
diff --git a/gdb/config/i386/i386m3.mh b/gdb/config/i386/i386m3.mh
index 66f9847..3b996df 100644
--- a/gdb/config/i386/i386m3.mh
+++ b/gdb/config/i386/i386m3.mh
@@ -8,4 +8,4 @@ NAT_FILE= nm-m3.h
 
 # Don't use the mmalloc library in Mach 3.
 MMALLOC = 
-MMALLOC_DISABLE = -DNO_MMALLOC
+MMALLOC_CFLAGS = -DNO_MMALLOC
diff --git a/gdb/config/i386/i386mk.mh b/gdb/config/i386/i386mk.mh
index cf1da57..3b2d524 100644
--- a/gdb/config/i386/i386mk.mh
+++ b/gdb/config/i386/i386mk.mh
@@ -5,4 +5,4 @@ XM_FILE= xm-i386osf1mk.h
 
 # Don't use the mmalloc library in Mach 3.
 MMALLOC = 
-MMALLOC_DISABLE = -DNO_MMALLOC
+MMALLOC_CFLAGS = -DNO_MMALLOC
diff --git a/gdb/config/i386/xm-i386v4.h b/gdb/config/i386/xm-i386v4.h
index 7d5aff0..7f782db 100644
--- a/gdb/config/i386/xm-i386v4.h
+++ b/gdb/config/i386/xm-i386v4.h
@@ -25,13 +25,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Pick up more stuff from the generic SVR4 host include file. */
 
 #include "xm-sysv4.h"
-
-/* If you expect to use the mmalloc package to obtain mapped symbol files,
-   for now you have to specify some parameters that determine how gdb places
-   the mappings in it's address space.  See the comments in map_to_address()
-   for details.  This is expected to only be a short term solution.  Yes it
-   is a kludge.
-   FIXME:  Make this more automatic. */
-
-#define MMAP_BASE_ADDRESS	0x81000000	/* First mapping here */
-#define MMAP_INCREMENT		0x01000000	/* Increment to next mapping */
diff --git a/gdb/config/i386/xm-linux.h b/gdb/config/i386/xm-linux.h
index 5004926..f63d8fc 100644
--- a/gdb/config/i386/xm-linux.h
+++ b/gdb/config/i386/xm-linux.h
@@ -33,14 +33,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Need R_OK etc, but USG isn't defined.  */
 #include <unistd.h>
 
-/* If you expect to use the mmalloc package to obtain mapped symbol files,
-   for now you have to specify some parameters that determine how gdb places
-   the mappings in it's address space.  See the comments in map_to_address()
-   for details.  This is expected to only be a short term solution.  Yes it
-   is a kludge.
-   FIXME:  Make this more automatic. */
-
-#define MMAP_BASE_ADDRESS	0x20000000	/* First mapping here */
-#define MMAP_INCREMENT		0x01000000	/* Increment to next mapping */
-
 #endif	/* #ifndef XM_LINUX_H */
diff --git a/gdb/config/m68k/xm-hp300hpux.h b/gdb/config/m68k/xm-hp300hpux.h
index fc29638..868bcbf 100644
--- a/gdb/config/m68k/xm-hp300hpux.h
+++ b/gdb/config/m68k/xm-hp300hpux.h
@@ -71,16 +71,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
   0, 0, 0, 0, 0, 0, 0, 0, \
   SIGILL }
 
-/* If you expect to use the mmalloc package to obtain mapped symbol files,
-   for now you have to specify some parameters that determine how gdb places
-   the mappings in it's address space.  See the comments in map_to_address()
-   for details.  This is expected to only be a short term solution.  Yes it
-   is a kludge.
-   FIXME:  Make this more automatic. */
-
-#define MMAP_BASE_ADDRESS	0xA0000000	/* First mapping here */
-#define MMAP_INCREMENT		0x01000000	/* Increment to next mapping */
-
 /* On hpux, autoconf 2.4 (and possibly others) does not properly detect that
    mmap is available.  Until this is fixed, we have to explicitly force 
    HAVE_MMAP.  -fnf */
diff --git a/gdb/config/m68k/xm-m68kv4.h b/gdb/config/m68k/xm-m68kv4.h
index c30dee5f..2149c8f 100644
--- a/gdb/config/m68k/xm-m68kv4.h
+++ b/gdb/config/m68k/xm-m68kv4.h
@@ -26,13 +26,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Pick up more stuff from the generic SVR4 host include file. */
 
 #include "xm-sysv4.h"
-
-/* If you expect to use the mmalloc package to obtain mapped symbol files,
-   for now you have to specify some parameters that determine how gdb places
-   the mappings in it's address space.  See the comments in map_to_address()
-   for details.  This is expected to only be a short term solution.  Yes it
-   is a kludge.
-   FIXME:  Make this more automatic. */
-
-#define MMAP_BASE_ADDRESS	0xC2000000	/* First mapping here */
-#define MMAP_INCREMENT		0x01000000	/* Increment to next mapping */
diff --git a/gdb/config/m68k/xm-sun3os4.h b/gdb/config/m68k/xm-sun3os4.h
index 7bc1ea2..5d81cc5 100644
--- a/gdb/config/m68k/xm-sun3os4.h
+++ b/gdb/config/m68k/xm-sun3os4.h
@@ -20,16 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "m68k/xm-sun3.h"
 #define FPU
 
-/* If you expect to use the mmalloc package to obtain mapped symbol files,
-   for now you have to specify some parameters that determine how gdb places
-   the mappings in it's address space.  See the comments in map_to_address()
-   for details.  This is expected to only be a short term solution.  Yes it
-   is a kludge.
-   FIXME:  Make this more automatic. */
-
-#define MMAP_BASE_ADDRESS	0xE0000000	/* First mapping here */
-#define MMAP_INCREMENT		0x01000000	/* Increment to next mapping */
-
 /* Prevent type conflicts between yacc malloc decls and defs.h */
 #define MALLOC_INCOMPATIBLE
 extern char *malloc();
diff --git a/gdb/config/m88k/cxux.mh b/gdb/config/m88k/cxux.mh
index 4a0d8fd..cc3cfc2 100644
--- a/gdb/config/m88k/cxux.mh
+++ b/gdb/config/m88k/cxux.mh
@@ -7,4 +7,4 @@ NAT_FILE= nm-cxux.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o cxux-nat.o corelow.o core-aout.o
 
 MMALLOC=
-MMALLOC_DISABLE= -DNO_MMALLOC
+MMALLOC_CFLAGS= -DNO_MMALLOC
diff --git a/gdb/config/mips/decstation.mh b/gdb/config/mips/decstation.mh
index dc55b5b..d7baecf 100644
--- a/gdb/config/mips/decstation.mh
+++ b/gdb/config/mips/decstation.mh
@@ -8,4 +8,4 @@ NATDEPFILES= infptrace.o inftarg.o corelow.o mips-nat.o fork-child.o
 # with a malloc(0) that returns 0.  Besides, it's useless on a machine
 # without a real mmap().
 MMALLOC = 
-MMALLOC_DISABLE = -DNO_MMALLOC
+MMALLOC_CFLAGS = -DNO_MMALLOC
diff --git a/gdb/config/mips/mipsm3.mh b/gdb/config/mips/mipsm3.mh
index 77279bd..3be486f 100644
--- a/gdb/config/mips/mipsm3.mh
+++ b/gdb/config/mips/mipsm3.mh
@@ -8,4 +8,4 @@ NAT_FILE= ../nm-m3.h
 
 # Don't use the mmalloc library in Mach 3.
 MMALLOC = 
-MMALLOC_DISABLE = -DNO_MMALLOC
+MMALLOC_CFLAGS = -DNO_MMALLOC
diff --git a/gdb/config/ns32k/ns32km3.mh b/gdb/config/ns32k/ns32km3.mh
index c1c88b6..363b04d 100644
--- a/gdb/config/ns32k/ns32km3.mh
+++ b/gdb/config/ns32k/ns32km3.mh
@@ -8,4 +8,4 @@ NAT_FILE= nm-m3.h
 
 # Don't use the mmalloc library in Mach 3.
 MMALLOC = 
-MMALLOC_DISABLE = -DNO_MMALLOC
+MMALLOC_CFLAGS = -DNO_MMALLOC
diff --git a/gdb/config/pa/xm-hppah.h b/gdb/config/pa/xm-hppah.h
index 412bf03..1b2a294 100644
--- a/gdb/config/pa/xm-hppah.h
+++ b/gdb/config/pa/xm-hppah.h
@@ -44,16 +44,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define MALLOC_INCOMPATIBLE
 
-/* If you expect to use the mmalloc package to obtain mapped symbol files,
-   for now you have to specify some parameters that determine how gdb places
-   the mappings in it's address space.  See the comments in map_to_address()
-   for details.  This is expected to only be a short term solution.  Yes it
-   is a kludge.
-   FIXME:  Make this more automatic. */
-
-#define MMAP_BASE_ADDRESS	0xA0000000	/* First mapping here */
-#define MMAP_INCREMENT		0x01000000	/* Increment to next mapping */
-
 /* On hpux, autoconf 2.4 (and possibly others) does not properly detect that
    mmap is available.  Until this is fixed, we have to explicitly force 
    HAVE_MMAP.  -fnf */
diff --git a/gdb/config/powerpc/aix4.mh b/gdb/config/powerpc/aix4.mh
index aaec415..27b47ec 100644
--- a/gdb/config/powerpc/aix4.mh
+++ b/gdb/config/powerpc/aix4.mh
@@ -13,7 +13,7 @@ NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o rs6000-nat.o xcoffread
 # Because of shared libraries, we risk ending up with *two*
 # incompatible versions of malloc if we use GNU malloc ...
 MMALLOC = 
-MMALLOC_DISABLE = -DNO_MMALLOC
+MMALLOC_CFLAGS = -DNO_MMALLOC
 
 # A bug in the AIX 3.2 libc.a results in unresolved references for .scalb and
 # .finite because we call ldexp via floatformat.  Circumvent by adding -lm.
diff --git a/gdb/config/sparc/sun4os4.mh b/gdb/config/sparc/sun4os4.mh
index 4047c5c..7b3709a 100644
--- a/gdb/config/sparc/sun4os4.mh
+++ b/gdb/config/sparc/sun4os4.mh
@@ -9,3 +9,9 @@ GDBSERVER_DEPFILES= low-sparc.o
 # anyone who wants to use NIS, which includes at least one Cygnus customer
 # (PR 3593).  So leave it this way until/unless we find a resolver which can
 # get names from either DNS or NIS from the same GDB binary.
+
+# SunOS 4.x has memory allocation calls in the C runtime.  However
+# since free() is never called with these objects, it is safe to
+# define MMCHECK_FORCE to 1 and thus force installation of the mmalloc
+# corruption checks.
+MMALLOC_CFLAGS = -I$(MMALLOC_SRC) -DMMCHECK_FORCE=1
diff --git a/gdb/config/sparc/xm-sun4os4.h b/gdb/config/sparc/xm-sun4os4.h
index 7e1f1e7..e50a213 100644
--- a/gdb/config/sparc/xm-sun4os4.h
+++ b/gdb/config/sparc/xm-sun4os4.h
@@ -22,16 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define FPU
 
-/* If you expect to use the mmalloc package to obtain mapped symbol files,
-   for now you have to specify some parameters that determine how gdb places
-   the mappings in it's address space.  See the comments in map_to_address()
-   for details.  This is expected to only be a short term solution.  Yes it
-   is a kludge.
-   FIXME:  Make this more automatic. */
-
-#define MMAP_BASE_ADDRESS	0xC0000000	/* First mapping here */
-#define MMAP_INCREMENT		0x01000000	/* Increment to next mapping */
-
 /* /usr/include/malloc.h is included by vx-share/xdr_ld, and might
    declare these using char * not void *.  The following should work with
    acc, gcc, or /bin/cc.  */
diff --git a/gdb/config/sparc/xm-sun4sol2.h b/gdb/config/sparc/xm-sun4sol2.h
index 274323a..9aeac16 100644
--- a/gdb/config/sparc/xm-sun4sol2.h
+++ b/gdb/config/sparc/xm-sun4sol2.h
@@ -31,16 +31,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define	gregset_t	prgregset_t
 #define	fpregset_t	prfpregset_t
 
-/* If you expect to use the mmalloc package to obtain mapped symbol files,
-   for now you have to specify some parameters that determine how gdb places
-   the mappings in it's address space.  See the comments in map_to_address()
-   for details.  This is expected to only be a short term solution.  Yes it
-   is a kludge.
-   FIXME:  Make this more automatic. */
-
-#define MMAP_BASE_ADDRESS	0xC0000000	/* First mapping here */
-#define MMAP_INCREMENT		0x01000000	/* Increment to next mapping */
-
 /* These are not currently used in SVR4 (but should be, FIXME!).  */
 #undef	DO_DEFERRED_STORES
 #undef	CLEAR_DEFERRED_STORES